chef-fork 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389fc33ea14f3940f41e337f0a43bb2acb33f524
-  data.tar.gz: 94fe767539b6be91ae9dacc76b2f92ec93a04771
+  metadata.gz: 1d17a69329759230186ad22f20d0351e83064065
+  data.tar.gz: 735fc1a41ec02e208324b378f582b5d00daae28a
 SHA512:
-  metadata.gz: 3d0a2d1eba11e63465a0b7e9b7dc926c7d6c148dbe392ca82a4acb1c4a6c9d752ff3204c479b40ccb1bfaa20db0812ec81ffabe74daaed3c436d57b381bd1745
-  data.tar.gz: 8153a3af4141e0b145548a628afc61ab60a9321682a6b05a173fb64f19025c55bd3a8cef8381b3a79534c5ae3db4e6c52e81447ec70a591a804eec92017021fd
+  metadata.gz: 336ca8301cb1f474636ac53aabd33fd66f6d9b21e9720137b4961a199176a836ebb8675e16bb915f9fa2760f9fa569684d3ba553922cacca1f45bf8fa6417d7f
+  data.tar.gz: 6586ba56251e95643770a1fd50be7efb974067b947aff31f3641394a6388cb8cd94a38190ea916a24b079a2e9f4811df7315e9372d38f005c1566524c1d8d088

data/chef-fork.gemspec

@@ -8,15 +8,14 @@ Gem::Specification.new do |spec|
   spec.version       = Chef::Fork::VERSION
   spec.authors       = ["Yamashita Yuu"]
   spec.email         = ["peek824545201@gmail.com"]
-
   spec.summary       = %q{A tool for your left hand, to have a meal cooked by chef.}
   spec.description   = %q{A tool for your left hand, to have a meal cooked by chef.}
   spec.homepage      = "https://github.com/yyuu/chef-fork"
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.9"

data/lib/chef/fork/application.rb

@@ -21,7 +21,6 @@ class Chef
       attr_reader :optparse
 
       def main(args=[])
-        configure_chef(locate_config_file("fork") || locate_config_file("knife"))
         rest = @optparse.order(args)
         begin
           command = get_command(rest.shift || "help").new(self)
@@ -31,6 +30,10 @@ class Chef
         end
       end
 
+      def configure(options={})
+        configure_chef(locate_config_file("fork") || locate_config_file("knife"), options)
+      end
+
       private
       def define_options()
         options.merge!({
@@ -98,7 +101,7 @@ class Chef
         end
       end
 
-      def configure_chef(config_file)
+      def configure_chef(config_file, options={})
         if config_file
           @logger.info("Using configuration from #{config_file}")
           Chef::Config.from_file(config_file)

data/lib/chef/fork/commands.rb

@@ -13,7 +13,7 @@ class Chef
         end
 
         def run(args=[])
-          rest = @application.optparse.order(args)
+          order_args(args=[])
         end
 
         private
@@ -30,6 +30,18 @@ class Chef
           @application.optparse
         end
 
+        def order_args(args=[])
+          args = @application.optparse.order(args)
+          @application.configure(@application.options)
+          args
+        end
+
+        def parse_args(args=[])
+          args = @application.optparse.parse(args)
+          @application.configure(@application.options)
+          args
+        end
+
         def rest()
           @rest ||= Chef::REST.new(Chef::Config[:chef_server_url])
         end

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

@@ -13,7 +13,7 @@ class Chef
     module Commands
       class Bootstrap < Ssh
         def run(args=[])
-          rest = optparse.parse(args)
+          rest = parse_args(args)
           if hostname = rest.shift
             command = bootstrap_command()
             ssh(hostname, [command])
@@ -75,14 +75,24 @@ class Chef
           template_file = options[:template_file] || find_template(options[:distro])
           if template_file
             template = File.read(template_file)
-            render_template(template)
+            command = render_template(template)
+            if options[:use_sudo]
+              "sudo #{command}"
+            else
+              command
+            end
           else
-            raise(NameError.new("Unknown distro: #{distro.inspect}"))
+            raise(NameError.new("Unknown distro: #{options[:distro].inspect}"))
           end
         end
 
         def find_template(name)
-          templates = $LOAD_PATH.map { |path| File.join(path, "chef", "knife", "bootstrap", "templates", "#{name}.erb") }
+          templates = $LOAD_PATH.map { |path|
+            [
+              File.join(path, "chef", "knife", "bootstrap", "templates", "#{name}.erb"), # Chef 12.x
+              File.join(path, "chef", "knife", "bootstrap", "#{name}.erb"), # Chef 11.x
+            ]
+          }.reduce(:+)
           templates.find { |path| File.exist?(path) }
         end
 

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

@@ -9,7 +9,7 @@ class Chef
     module Commands
       class Cookbook < Noop
         def run(args=[])
-          rest = optparse.order(args)
+          rest = order_args(args)
           case rest.first
           when "edit"
             cookbook_edit(rest.slice(1..-1) || [])

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

@@ -11,7 +11,7 @@ class Chef
     module Commands
       class Data < Noop
         def run(args=[])
-          rest = optparse.order(args)
+          rest = order_args(args)
           case rest.first
           when "bag"
             data_bag(rest.slice(1..-1) || [])

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

@@ -8,7 +8,7 @@ class Chef
     module Commands
       class Databag < Data
         def run(args=[])
-          rest = optparse.order(args)
+          rest = order_args(args)
           data_bag(rest)
         end
       end

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

@@ -10,7 +10,7 @@ class Chef
     module Commands
       class Environment < Noop
         def run(args=[])
-          rest = optparse.order(args)
+          rest = order_args(args)
           case rest.first
           when "edit"
             environment_edit(rest.slice(1..-1) || [])

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

@@ -10,7 +10,8 @@ class Chef
     module Commands
       class Help < Noop
         def run(args=[])
-          if command = args.shift
+          rest = order_args(args)
+          if command = rest.shift
             case command
             when "commands"
               paths = $LOAD_PATH.map { |path|

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

@@ -10,7 +10,7 @@ class Chef
     module Commands
       class Node < Noop
         def run(args=[])
-          rest = optparse.order(args)
+          rest = order_args(args)
           case rest.first
           when "edit"
             node_edit(rest.slice(1..-1) || [])
@@ -19,7 +19,7 @@ class Chef
           when "show"
             node_show(rest.slice(1..-1) || [])
           else
-            raise(NameError.new(rest.inspect))
+            raise(NameError.new(@args.inspect))
           end
         end
 

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

@@ -10,7 +10,7 @@ class Chef
     module Commands
       class Role < Noop
         def run(args=[])
-          rest = optparse.order(args)
+          rest = order_args(args)
           case rest.first
           when "edit"
             role_edit(rest.slice(1..-1) || [])

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

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

data/lib/chef/fork/version.rb

@@ -1,5 +1,5 @@
 class Chef
   class Fork
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: chef-fork
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
@@ -69,7 +69,8 @@ dependencies:
 description: A tool for your left hand, to have a meal cooked by chef.
 email:
 - peek824545201@gmail.com
-executables: []
+executables:
+- fork
 extensions: []
 extra_rdoc_files: []
 files: