config_curator 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e025bf5875775d284843dd093df45960f282e908
-  data.tar.gz: 942b7ecffe91f214959dcccbbfaf88fd56c46249
+  metadata.gz: 32b4ddb600f1f140e66c33d83bdde687f92e94a3
+  data.tar.gz: 85b1b44674ba0ac5df73cd64e33e509a44b9a77c
 SHA512:
-  metadata.gz: 6456369212a86c78383e814acf404770dcb96719b935bd8f1b88f87a9d65f00c517343846e03c552e36944ca226bcf7444e3f29280866ef66e64d76d88745780
-  data.tar.gz: 1c49c2541f670186678b071d3c307bcfa7a73344d3224a655ff5be6302317ed0c3dd4d4d132309bc8d329ee13fb5bc75e465c4d9103a744ed3e701a875ce828b
+  metadata.gz: 71e19020b4da56639b484babdd8e153e45ebdffdcf8423546bfd7de17d296738c9cd8f447bdd97d45aaf1230d81910e15a36a3a24078ae231f63a3d1efbe9582
+  data.tar.gz: 1efebe21980e568e141376b77c92c60da909ba77c042b8a91ed490c817e2fc41451828e0985dd7d5422e1ca96b91fb758ac8ecf28aafa445115f2b92894dc7c4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Config Curator ChangeLog
 
+## 0.1.0
+
+- PackageLookup#tools separates tool identifier and tool command.
+- PackageLookup#installed? checks for tool command before lookup.
+- Support for FreeBSD's pkgng added to PackageLookup.
+
 ## 0.0.1
 
 - Initial development release.

data/lib/config_curator/package_lookup.rb

@@ -16,7 +16,12 @@ module ConfigCurator
     class LookupFailed < RuntimeError; end
 
     # Default list of supported package tools.
-    TOOLS = %i(dpkg pacman)
+    # @see #tools
+    TOOLS = {
+      dpkg: 'dpkg',
+      pacman: 'pacman',
+      pkgng: 'pkg',
+    }
 
     attr_accessor :tool, :tools
 
@@ -25,7 +30,8 @@ module ConfigCurator
     end
 
     # Package tools that support package lookup ordered by preference.
-    # @return [Array] list of supported package tools
+    # Each key is an identifier and each value is the command to check for.
+    # @return [Hash] hash of supported package tools
     def tools
       @tools ||= TOOLS
     end
@@ -35,9 +41,9 @@ module ConfigCurator
     def tool
       return @tool if @tool
 
-      tools.each do |cmd|
-        if command? cmd
-          return @tool = cmd
+      tools.each do |k, v|
+        if command? v
+          return @tool = k
         end
       end
       @tool
@@ -48,6 +54,10 @@ module ConfigCurator
     # @return [Boolean] if package is installed
     def installed? package
       fail LookupFailed, 'No supported package tool found.' if tool.nil?
+
+      cmd = tools[tool]
+      fail LookupFailed, "Package tool '#{cmd}' not found." if command?(cmd).nil?
+
       send tool, package
     end
 
@@ -79,6 +89,13 @@ module ConfigCurator
         wait_thr.value.to_i == 0
       end
     end
+
+    def pkgng package
+      cmd = command? 'pkg'
+      Open3.popen3 cmd, 'info', package do |_, _ , _, wait_thr|
+        wait_thr.value.to_i == 0
+      end
+    end
   end
 
 end

data/lib/config_curator/version.rb

@@ -1,4 +1,4 @@
 module ConfigCurator
   # Config Curator version.
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/spec/package_lookup_spec.rb

@@ -32,8 +32,8 @@ describe ConfigCurator::PackageLookup do
     context "when tool not set" do
 
       it "returns the first avaible tool" do
-        allow(lookup).to receive(:command?).with(:dpkg).and_return(true)
-        lookup.tools = %i(dpkg pacman)
+        lookup.tools = {dpkg: 'dpkg', pacman: 'pacman'}
+        allow(lookup).to receive(:command?).with('dpkg').and_return(true)
         expect(lookup.tool).to eq :dpkg
       end
     end
@@ -41,17 +41,43 @@ describe ConfigCurator::PackageLookup do
 
   describe "#installed?" do
 
-    it "calls the corresponding private lookup method" do
-      lookup.tool = :dpkg
-      expect(lookup).to receive(:dpkg).with('rsync')
-      lookup.installed? 'rsync'
+    context "when package is found" do
+
+      it "calls the corresponding private lookup method and returns true" do
+        lookup.tool = :dpkg
+        cmd = lookup.tools[:dpkg]
+        allow(lookup).to receive(:command?).with(cmd).and_return(cmd)
+        expect(lookup).to receive(:dpkg).with('rsync').and_return(true)
+        expect(lookup.installed? 'rsync').to be true
+      end
+    end
+
+    context "when package not found" do
+
+      it "calls the corresponding private lookup method and returns false" do
+        lookup.tool = :dpkg
+        cmd = lookup.tools[:dpkg]
+        allow(lookup).to receive(:command?).with(cmd).and_return(cmd)
+        expect(lookup).to receive(:dpkg).with('rsync').and_return(false)
+        expect(lookup.installed? 'rsync').to be false
+      end
     end
 
     context "when no package tool found" do
 
       it "fails" do
-        lookup.tools = %i(dpkg)
-        allow(lookup).to receive(:command?).with(:dpkg).and_return(false)
+        lookup.tools = {dpkg: 'dpkg'}
+        allow(lookup).to receive(:command?).with('dpkg').and_return(nil)
+        expect { lookup.installed? 'rsync' }.to raise_error ConfigCurator::PackageLookup::LookupFailed
+      end
+    end
+
+    context "when package tool not found" do
+
+      it "fails" do
+        lookup.tool = :dpkg
+        cmd = lookup.tools[:dpkg]
+        allow(lookup).to receive(:command?).with(cmd).and_return(nil)
         expect { lookup.installed? 'rsync' }.to raise_error ConfigCurator::PackageLookup::LookupFailed
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_curator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Evan Boyd Sosenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport