chef-fork 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde528113e145397075b09d8fb0acf5c4761fcb9
-  data.tar.gz: 4276edcd1989f0f75cf1be4beee09dc101b47ed7
+  metadata.gz: ff9a6a1e5886c238b2375110fc72f34624bded15
+  data.tar.gz: 34d6aaf1a3c65f92da6ec7190688d1abe7209c7f
 SHA512:
-  metadata.gz: b6bda285ea2d5ec7b4df7af95ce3f422994f0450b110d5d8ff6ed7ac9f32381260f19a626fdd2e60b8470393430a50e76d5e6103a6d81f0af25ec32144e9c57f
-  data.tar.gz: 990b36264081d96946ecba6bfd981a68d63080deae6d149320b9d115e639367d47637f46d4b617b2c5cb0d945ad1e1cff10df91cdc851fbdbb90a1fb1a23b403
+  metadata.gz: e42f96c88b4d3d13fda2e55d96f79791b18116cdfd2cd70bc35095e0f126a794c9abf53d4ffdc242899465d9adbb09fd75fbe9ee2b45931e954310b627a3ca08
+  data.tar.gz: 12dc3fee80a97cbf77e6c09c5d084976cc0119e4fe7fc7e1ad511f5c24ff563193a3b55b189099ef6ea5b9c32b544b2e540c6713671b223de54d9ef25d02f600

data/bin/fork

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
-
-# bundler/setup doesn't work expectedly when installed via gem
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
-require "bundler/setup"
-
 require "chef/fork"
 Chef::Fork.new.main(ARGV.dup)

data/lib/chef/fork/commands/bootstrap.rb

@@ -13,10 +13,11 @@ class Chef
     module Commands
       class Bootstrap < Ssh
         def run(args=[])
-          rest = optparse.order(args)
-          hostname = rest.shift
-          command = bootstrap_command()
-          ssh(hostname, [command])
+          rest = optparse.parse(args)
+          if hostname = rest.shift
+            command = bootstrap_command()
+            ssh(hostname, [command])
+          end
         end
 
         private

data/lib/chef/fork/commands/cookbook.rb

@@ -8,13 +8,14 @@ class Chef
     module Commands
       class Cookbook < Noop
         def run(args=[])
-          case args.first
+          rest = optparse.order(args)
+          case rest.first
           when "show"
-            cookbook_show(args.slice(1..-1))
+            cookbook_show(rest.slice(1..-1) || [])
           when "upload"
-            cookbook_upload(args.slice(1..-1))
+            cookbook_upload(rest.slice(1..-1) || [])
           else
-            raise(NameError.new(args.inspect))
+            raise(NameError.new(rest.inspect))
           end
         end
 

data/lib/chef/fork/commands/data.rb

@@ -8,11 +8,12 @@ class Chef
     module Commands
       class Data < Noop
         def run(args=[])
-          case args.first
+          rest = optparse.order(args)
+          case rest.first
           when "bag"
-            data_bag(args.slice(1..-1))
+            data_bag(rest.slice(1..-1) || [])
           else
-            raise(NameError.new(args.inspect))
+            raise(NameError.new(rest.inspect))
           end
         end
 
@@ -20,9 +21,9 @@ class Chef
         def data_bag(args=[])
           case args.first
           when "from"
-            data_bag_from(args.slice(1..-1))
+            data_bag_from(args.slice(1..-1) || [])
           when "show"
-            data_bag_show(args.slice(1..-1))
+            data_bag_show(args.slice(1..-1) || [])
           else
             raise(NameError.new(args.inspect))
           end
@@ -31,7 +32,7 @@ class Chef
         def data_bag_from(args=[])
           case args.first
           when "file"
-            data_bag_from_file(args.slice(1..-1))
+            data_bag_from_file(args.slice(1..-1) || [])
           else
             raise(NameError.new(args.inspect))
           end

data/lib/chef/fork/commands/databag.rb

@@ -8,36 +8,8 @@ class Chef
     module Commands
       class Databag < Data
         def run(args=[])
-          data_bag(args)
-        end
-
-        private
-        def data_bag(args=[])
-          case args.first
-          when "from"
-            data_bag_from(args.slice(1..-1))
-          when "show"
-            data_bag_show(args.slice(1..-1))
-          else
-            raise(NameError.new(args.inspect))
-          end
-        end
-
-        def data_bag_from(args=[])
-          case args.first
-          when "file"
-            data_bag_from_file(args.slice(1..-1))
-          else
-            raise(NameError.new(args.inspect))
-          end
-        end
-
-        def data_bag_from_file(args=[])
-          raise(NotImplementedError.new(args.inspect))
-        end
-
-        def data_bag_show(args=[])
-          raise(NotImplementedError.new(args.inspect))
+          rest = optparse.order(args)
+          data_bag(rest)
         end
       end
     end

data/lib/chef/fork/commands/environment.rb

@@ -8,13 +8,14 @@ class Chef
     module Commands
       class Environment < Noop
         def run(args=[])
-          case args.first
+          rest = optparse.order(args)
+          case rest.first
           when "from"
-            environment_from(args.slice(1..-1))
+            environment_from(rest.slice(1..-1) || [])
           when "show"
-            environment_show(args.slice(1..-1))
+            environment_show(rest.slice(1..-1) || [])
           else
-            raise(NameError.new(args.inspect))
+            raise(NameError.new(rest.inspect))
           end
         end
 
@@ -22,7 +23,7 @@ class Chef
         def environment_from(args=[])
           case args.first
           when "file"
-            environment_from_file(args.slice(1..-1))
+            environment_from_file(args.slice(1..-1) || [])
           else
             raise(NameError.new(args.inspect))
           end

data/lib/chef/fork/commands/role.rb

@@ -8,13 +8,14 @@ class Chef
     module Commands
       class Role < Noop
         def run(args=[])
-          case args.first
+          rest = optparse.order(args)
+          case rest.first
           when "from"
-            role_from(args.slice(1..-1))
+            role_from(rest.slice(1..-1) || [])
           when "show"
-            role_show(args.slice(1..-1))
+            role_show(rest.slice(1..-1) || [])
           else
-            raise(NameError.new(args.inspect))
+            raise(NameError.new(rest.inspect))
           end
         end
 

data/lib/chef/fork/commands/ssh.rb

@@ -10,8 +10,9 @@ class Chef
       class Ssh < Noop
         def run(args=[])
           rest = optparse.order(args)
-          hostname = rest.shift
-          ssh(hostname, rest)
+          if hostname = rest.shift
+            ssh(hostname, rest)
+          end
         end
 
         private

data/lib/chef/fork/version.rb

@@ -1,5 +1,5 @@
 class Chef
   class Fork
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-fork
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yamashita Yuu