bindep 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: efaacbf7d22b5b1a56065c0637bd033c08cfe882
-  data.tar.gz: 5a9da55da0c0169b1deacaacdb28252cb5bfb1da
+  metadata.gz: d27f78a2ad658f6815603eae4fd3da46f8ebf9b7
+  data.tar.gz: 15ff0d3c12371bc02d10e64f1fb6f4672cc014da
 SHA512:
-  metadata.gz: 27538adddfa34a99552e5df3afdec80902001c04140c70aeed4e621a6cb2cbc88d164a6525bb2778e1087f74d3f8fa0410e5c91c2fd4365803ea6474fc1852f2
-  data.tar.gz: 36e600db1e96ae819abeae43ba75c7c830b8f871d68928194889d080f543dfc4749b95f52763ab1bccf3ee001eaf630d416a67fcc4b1465e84e3e84ed55d22ef
+  metadata.gz: f5b51d74c60bc541884240f3ded327c310bf3626ca6ce1d1c3eb6492325fdaaa45638b5ba86296e06a7163cb9d458f24808724b69d468c93bafeb6bdba5a5074
+  data.tar.gz: ce4a6f27c33acab3038586a627188c1ca3c4f57e83fcff1d8b8abfeb97431fa04eca6bbe16e32b6878be82096d3fcff3dbb0a9a3866ea110d8f4d7810153855c

data/lib/bindep/item.rb

@@ -6,7 +6,7 @@ module Bindep
     def initialize(id)
       @id = id.to_sym
     end
-    
+
     # Get the command for the current system. Return nil if command is not available.
     def local_command(reset = false)
       @local_command = nil if reset
@@ -16,20 +16,19 @@ module Bindep
       end
     end
 
-    # Get the installation commands for the current system as a single string. 
+    # Get the installation commands for the current system as a single string.
     # Return nil if there is no command that fits the current system.
     def install_command
       list = []
-      
-      list << OS.apt_install(apt) if apt && OS.apt?
-      list << OS.yum_install(yum) if yum && OS.yum?
+
+      list << OS.apt_install(apt) if apt && OS.apt? && !OS.yum?
+      list << OS.yum_install(yum) if yum && OS.yum? && !OS.apt?
       list << OS.brew_install(brew) if brew && OS.brew?
       list << OS.npm_install(npm) if npm && OS.npm?
-      list << OS.rubygem_install(rubygem) if rubygem && OS.rubygem?    
+      list << OS.rubygem_install(rubygem) if rubygem && OS.rubygem?
       list << @install_command if @install_command
 
       list.empty? ? nil : list.join("; ")
     end
   end
 end
-

data/lib/bindep/version.rb

@@ -1,3 +1,3 @@
 module Bindep
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/bindep/item_spec.rb

@@ -72,7 +72,7 @@ describe Bindep::Item do
       item.command = [ "foo_bar_not_here", "cat" ]
 
       expect(item.local_command).to eq "cat"
-      
+
       item.command = "foo_bar_not_here"
 
       expect(item.local_command).to eq "cat"
@@ -83,12 +83,12 @@ describe Bindep::Item do
       item.command = [ "foo_bar_not_here", "cat" ]
 
       expect(item.local_command).to eq "cat"
-      
+
       item.command = "grep"
 
       expect(item.local_command(true)).to eq "grep"
     end
-  end 
+  end
 
   # cannot cover all tests (would be 2^n test cases, n = package handler count),
   # so we choose a few general ones and edge cases
@@ -104,21 +104,20 @@ describe Bindep::Item do
       expect(item.install_command).to eq cmd
     end
 
-    it "works all commands given and all available" do
+    it "works all commands given and all available (except yum)" do
       Bindep::OS.instance_variable_set :@command_exists_cache, {
-        apt: true, npm: true, brew: true, yum: true, rubygem: true
+        apt: true, npm: true, brew: true, yum: false, rubygem: true
       }
 
       item.apt = "p_apt"
-      item.npm = "p_npm"
       item.yum = "p_yum"
+      item.npm = "p_npm"
       item.brew = "p_brew"
       item.rubygem = "p_gem"
       item.install_command = "my package"
-      
+
       results = [
         Bindep::OS.apt_install("p_apt"),
-        Bindep::OS.yum_install("p_yum"),
         Bindep::OS.brew_install("p_brew"),
         Bindep::OS.npm_install("p_npm"),
         Bindep::OS.rubygem_install("p_gem"),
@@ -128,24 +127,38 @@ describe Bindep::Item do
       expect(item.install_command).to eq results.join("; ")
     end
 
-    it "works some commands given and some available" do
+    it "does not run any of apt or yum if both are available" do
       Bindep::OS.instance_variable_set :@command_exists_cache, {
-        apt: true, npm: true, brew: false, yum: true, rubygem: false
+        apt: true, npm: true, brew: true, yum: true, rubygem: true
       }
 
       item.apt = "p_apt"
+      item.yum = "p_yum"
+      item.brew = "p_brew"
+
+      results = [
+        Bindep::OS.brew_install("p_brew"),
+      ]
+
+      expect(item.install_command).to eq results.join("; ")
+    end
+
+    it "works some commands given and some available" do
+      Bindep::OS.instance_variable_set :@command_exists_cache, {
+        apt: false, npm: true, brew: false, yum: true, rubygem: false
+      }
+
       item.npm = nil
       item.yum = "p_yum"
       item.brew = "p_brew"
       item.rubygem = "p_gem"
       item.install_command = nil
-      
+
       results = [
-        Bindep::OS.apt_install("p_apt"),
         Bindep::OS.yum_install("p_yum"),
       ]
 
       expect(item.install_command).to eq results.join("; ")
     end
-  end 
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindep
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Niko Dziemba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler