chef-fork 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ab8b8ac21df3a0d5b098212c5ffbeb9e04d451
-  data.tar.gz: 36b026de407cc595256b0e3e6c48479ed8eaa1fd
+  metadata.gz: fe0eeb08f02296252609611b83e26234f5e7f138
+  data.tar.gz: d6031a3748bc8f28e83286d918a960f0578d6f9b
 SHA512:
-  metadata.gz: ded002d6b1c0f3f4765b3f2ef53a8841abf2cbfad90f2b44dc11844a3303fa33eec65a5add1202e56394e89af8b53b66ffc746dfb5ede4ce671fbbc2e0e10f3e
-  data.tar.gz: 3ed37a840b18dec190520d9c095aeb8bd55b46cbda682cac6990057e2ae4ad55d32e2c06a0659091347377b0e31e4dc4916083ba470681e7839d380077f804b4
+  metadata.gz: 9f76363e0b5a9d7d674418d42de7d1af0c0b60b3b807cc5693779e78ccaa57676dd723a23ad68dc5e2673db17bcfbfbee7b690be94296c59717612a9242768cc
+  data.tar.gz: 46609e2da25c04ae096a2adc73c26767e26176a612be4c9fa88df96bdb24bc6e1684bb9fe5be3aaa1ed36cd9a42be229cc720ae8ed955bb5920ddecfe2366742

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

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require "chef/knife/core/bootstrap_context"
+
+class Chef
+  class Fork
+    module Bootstrap
+      class Context < ::Chef::Knife::Core::BootstrapContext
+      end
+    end
+  end
+end

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

@@ -3,10 +3,11 @@
 
 require "chef"
 require "chef/config"
-require "chef/knife/core/bootstrap_context"
+require "chef/encrypted_data_bag_item"
 require "erubis"
 require "json"
 require "shellwords"
+require "chef/fork/bootstrap/context"
 require "chef/fork/commands/ssh"
 
 class Chef
@@ -94,6 +95,8 @@ class Chef
         def find_template(name)
           templates = $LOAD_PATH.map { |path|
             [
+              File.join(path, "chef", "fork", "bootstrap", "templates", "#{name}.erb"), # Chef 12.x
+              File.join(path, "chef", "fork", "bootstrap", "#{name}.erb"), # Chef 11.x
               File.join(path, "chef", "knife", "bootstrap", "templates", "#{name}.erb"), # Chef 12.x
               File.join(path, "chef", "knife", "bootstrap", "#{name}.erb"), # Chef 11.x
             ]
@@ -102,7 +105,23 @@ class Chef
         end
 
         def render_template(template)
-          context = Chef::Knife::Core::BootstrapContext.new(options, options[:run_list], Chef::Config)
+          case Chef::VERSION.split(".").first
+          when "11"
+            context = Chef::Fork::Bootstrap::Context.new(options, options[:run_list], Chef::Config)
+          else
+            if Chef::Config[:knife][:secret]
+              secret = Chef::Config[:knife][:secret]
+            else
+              if Chef::Config[:knife][:secret_file]
+                secret = Chef::EncryptedDataBagItem.load_secret(Chef::Config[:knife][:secret_file])
+              end
+            end
+            if secret
+              context = Chef::Fork::Bootstrap::Context.new(options, options[:run_list], Chef::Config, secret)
+            else
+              context = Chef::Fork::Bootstrap::Context.new(options, options[:run_list], Chef::Config)
+            end
+          end
           Erubis::Eruby.new(template).evaluate(context)
         end
       end

data/lib/chef/fork/version.rb

@@ -1,5 +1,5 @@
 class Chef
   class Fork
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-fork
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - knife-and-fork.md
 - lib/chef/fork.rb
 - lib/chef/fork/application.rb
+- lib/chef/fork/bootstrap/context.rb
 - lib/chef/fork/commands.rb
 - lib/chef/fork/commands/bootstrap.rb
 - lib/chef/fork/commands/cookbook.rb
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool for your left hand, to have a meal cooked by chef.