Fix install dependencies for GitHub packages (#159)

* Fix install dependencies for GitHub packages

* Add tests

Author: xemlock

src/Bowerphp/Installer/Installer.php

@@ -75,6 +75,14 @@ public function install(PackageInterface $package)
         }
         $this->zipArchive->close();
 
+        // merge package info with bower.json contents
+        $bowerJsonPath = $this->config->getInstallDir() . '/' . $package->getName() . '/bower.json';
+        if ($this->filesystem->exists($bowerJsonPath)) {
+            $bowerJson = $this->filesystem->read($bowerJsonPath);
+            $bower = json_decode($bowerJson, true);
+            $package->setInfo(array_merge($bower, $package->getInfo()));
+        }
+
         // create .bower.json metadata file
          // XXX we still need to add some other info
         $dotBowerContent = array_merge($package->getInfo(), ['version' => $package->getVersion()]);

tests/Bowerphp/Test/Installer/InstallerTest.php

@@ -56,6 +56,7 @@ public function testInstall()
 }';
 
         $this->filesystem
+            ->shouldReceive('exists')->with(getcwd() . '/bower_components/jquery/bower.json')->andReturn(false)
             ->shouldReceive('write')->with(getcwd() . '/bower_components/jquery/foo', 'foo content')
             ->shouldReceive('write')->with(getcwd() . '/bower_components/jquery/.bower.json', $json)
             ->shouldReceive('touch')->with(getcwd() . '/bower_components/jquery/foo', 1396303200)
@@ -90,6 +91,7 @@ public function testUpdate()
 }';
 
         $this->filesystem
+            ->shouldReceive('exists')->with(getcwd() . '/bower_components/jquery/bower.json')->andReturn(false)
             ->shouldReceive('write')->with(getcwd() . '/bower_components/jquery/foo', 'foo content')
             ->shouldReceive('write')->with(getcwd() . '/bower_components/jquery/.bower.json', $json)
             ->shouldReceive('touch')->with(getcwd() . '/bower_components/jquery/foo', 1396303200)
@@ -98,6 +100,52 @@ public function testUpdate()
         $this->installer->update($package);
     }
 
+    public function testInstallAndMergeInfoWithBowerJsonContents()
+    {
+        $package = Mockery::mock('Bowerphp\Package\PackageInterface');
+
+        $info = [
+            'name'         => 'jquery-ui',
+            'version'      => '1.12.1',
+            'dependencies' => [
+                'jquery' => '>=1.6',
+            ],
+        ];
+
+        $package
+            ->shouldReceive('getName')->andReturn('jquery-ui')
+            ->shouldReceive('getVersion')->andReturn('1.12.1')
+            ->shouldReceive('getInfo')->andReturn([])->once()
+            ->shouldReceive('setInfo')->with($info)->andReturnSelf()
+            ->shouldReceive('getInfo')->andReturn($info);
+
+        $json = '{
+    "name": "jquery-ui",
+    "version": "1.12.1",
+    "dependencies": {
+        "jquery": ">=1.6"
+    }
+}';
+
+        $this->zipArchive
+            ->shouldReceive('open')->with('./tmp/jquery-ui')->andReturn(true)
+            ->shouldReceive('getNumFiles')->andReturn(1)
+            ->shouldReceive('getNameIndex')->with(0)->andReturn('jquery-ui')
+            ->shouldReceive('statIndex')->andReturn(['name' => 'jquery-ui/bower.json', 'size' => 107, 'mtime' => 1483795099])
+            ->shouldReceive('getStream')->with('jquery-ui/bower.json')->andReturn($json)
+            ->shouldReceive('close');
+
+        $this->filesystem
+            ->shouldReceive('exists')->with(getcwd() . '/bower_components/jquery-ui/bower.json')->andReturn(true)
+            ->shouldReceive('write')->with(getcwd() . '/bower_components/jquery-ui/.bower.json', $json)
+            ->shouldReceive('write')->with(getcwd() . '/bower_components/jquery-ui/bower.json', $json)
+            ->shouldReceive('touch')->with(getcwd() . '/bower_components/jquery-ui/bower.json', 1483795099)
+            ->shouldReceive('read')->with(getcwd() . '/bower_components/jquery-ui/bower.json')->andReturn($json)
+        ;
+
+        $this->installer->install($package);
+    }
+
     /**
      * @expectedException        \RuntimeException
      * @expectedExceptionMessage Unable to open zip file ./tmp/jquery.