ey_enzyme 0.9.45.ruby19.1 → 0.9.48

data/lib/ey_enzyme.rb

@@ -6,8 +6,6 @@ require "optparse"
 
 require 'json'
 require 'restclient'
-require 'chef'
-require 'chef/client'
 
 module EY; end
 

data/lib/ey_enzyme/api.rb

@@ -38,6 +38,7 @@ module EY::Enzyme
 
     #upload, as in, upload the log file output of the chef run
     def upload(type, content)
+      content = content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
       retry_api("store", :type => type, :content => content)
     rescue => e
       #blanket rescue feels dangerous, but we're at least logging it

data/lib/ey_enzyme/cli.rb

@@ -104,14 +104,14 @@ module EY::Enzyme
     def deploy
       @logger.info "Starting configuration run"
 
-      update_dna
+      json = update_dna
 
       case @opts[:type]
       when :main
         run_main
-        run_custom
+        run_custom(json)
       when :custom
-        run_custom
+        run_custom(json)
       else
         raise "Unknown type: #{@opts[:type].inspect}"
       end
@@ -124,20 +124,20 @@ module EY::Enzyme
       main_cookbooks.run
     end
 
-    def run_custom
+    def run_custom(json)
       report 'running custom recipes if they exist'
-      custom_cookbooks.run
+      url = @opts.has_key?(:custom_recipes_url) ? @opts[:custom_recipes_url] : @api.custom_recipe_url
+      update_custom_dna(json) if url
+
+      @custom_cookbooks ||= CookbookSet.new(@opts, "custom", CUSTOM_RECIPE_PATH, url, @api)
+
+      @custom_cookbooks.run
     end
 
     def main_cookbooks
       @main_cookbooks ||= CookbookSet.new(@opts, "main", MAIN_RECIPE_PATH, @opts[:recipes_url], @api)
     end
 
-    def custom_cookbooks
-      url = @opts.has_key?(:custom_recipes_url) ? @opts[:custom_recipes_url] : @api.custom_recipe_url
-      @custom_cookbooks ||= CookbookSet.new(@opts, "custom", CUSTOM_RECIPE_PATH, url, @api)
-    end
-
     def update_dna
       @logger.debug "Getting instance's DNA"
 
@@ -145,11 +145,28 @@ module EY::Enzyme
         raise DNAError, "failed to fetch DNA"
       end
 
-      json["quick"] = true if @opts[:quick]
-
       @logger.debug "Writing json dna to file system"
+      update_main_dna(json)
+      json
+    end
+
+    def update_main_dna(json)
+      main_json = json.dup
+      main_json['run_list'] = 'recipe[ey-base]'
+      main_json["quick"] = true if @opts[:quick]
+      update_chef_dna("/etc/chef/dna.json", main_json)
+    end
+
+    def update_custom_dna(json)
+      custom_json = json.dup
+      custom_json['run_list'] = 'recipe[main]'
+      # Make sure the path exist, it's soooo wrong to write this file before the cookbooks have been downloaded nor the config written
+      FileUtils.mkdir_p('/etc/chef-custom/') unless File.exists?('/etc/chef-custom/')
+      update_chef_dna("/etc/chef-custom/dna.json", custom_json)
+    end
 
-      File.open("/etc/chef/dna.json", 'w') do |f|
+    def update_chef_dna(file, json)
+      File.open(file, 'w') do |f|
         f.puts JSON.pretty_generate(json)
         f.chmod(0600)
       end

data/lib/ey_enzyme/cookbook_set.rb

@@ -49,7 +49,7 @@ module EY::Enzyme
     end
 
     def execute
-      command = "#{@opts[:chef_bin]} -j /etc/chef/dna.json -c #{chef_config} -r \"#{@recipes_url}\" > #{@chef_log} 2>&1"
+      command = "#{@opts[:chef_bin]} -j #{chef_dna} -c #{chef_config} -r \"#{@recipes_url}\" > #{@chef_log} 2>&1"
       @logger.debug "Running: #{command}"
       if system(command)
         @logger.info "Running telinit"
@@ -90,6 +90,10 @@ module EY::Enzyme
       main? ? "/etc/chef/solo.rb" : "/etc/chef-custom/solo.rb"
     end
 
+    def chef_dna
+      main? ? '/etc/chef/dna.json' : '/etc/chef-custom/dna.json'
+    end
+
     def chef_error_from_log
       unless File.exist?(@chef_log)
         return "(log doesn't exist)"

data/lib/ey_enzyme/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Enzyme
-    VERSION = "0.9.45.ruby19.1"
+    VERSION = "0.9.48"
   end
 end

metadata

@@ -1,16 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_enzyme
 version: !ruby/object:Gem::Version 
-  hash: -966684450
-  prerelease: 7
+  hash: 91
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 45
-  - ruby
-  - 19
-  - 1
-  version: 0.9.45.ruby19.1
+  - 48
+  version: 0.9.48
 platform: ruby
 authors: 
 - Engine Yard Inc.
@@ -50,44 +47,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: chef
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: -3806225206
-        segments: 
-        - 0
-        - 10
-        - 8
-        - patch
-        - 3
-        version: 0.10.8.patch3
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: chef-deploy
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 2
-        - 5
-        version: 0.2.5
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +60,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +75,11 @@ dependencies:
         - 2
         version: "1.2"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +89,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,7 +103,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 description: Gem for kicking off chef recipes
 email: ninja@engineyard.com
 executables: 
@@ -180,14 +143,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -197,4 +158,3 @@ specification_version: 3
 summary: Gem for kicking off chef recipes
 test_files: []
 
-has_rdoc: