iron_chef 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    iron_chef (0.0.10)
-      capistrano (>= 2.15.4)
+    iron_chef (0.0.11)
+      capistrano (~> 2.15)
       json
 
 GEM

data/bin/ironchef

@@ -75,13 +75,6 @@ files = {
 
   FILE
 
-  "roles/base_server.rb" => unindent(<<-FILE),
-    name "base_server"
-    description "Base Server Role"
-    # run_list
-    # default_attributes
-  FILE
-
   "roles/app_server.rb" => unindent(<<-FILE),
     name "app_server"
     description "Application Server Role"
@@ -89,13 +82,6 @@ files = {
     # default_attributes
   FILE
 
-  "roles/db_server.rb" => unindent(<<-FILE),
-    name "db_server"
-    description "Database Server Role"
-    # run_list
-    # default_attributes
-  FILE
-
   "roles/web_server.rb" => unindent(<<-FILE),
     name "web_server"
     description "Web Server Role"
@@ -105,6 +91,10 @@ files = {
 
   "cookbooks/.gitkeep" => '',
 
+  "tmp/.gitkeep" => '',
+
+  "site-cookbooks/.gitkeep" => '',
+
   "site-cookbooks/commons/recipes/default.rb" => unindent(<<-FILE),
   # retrieve environment specific data bag item
   env = Chef::DataBagItem.load('environments', node['chef_environment'])

data/iron_chef.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano', '>= 2.15.4'
+  gem.add_dependency 'capistrano', '~> 2.15'
   gem.add_dependency 'json'
 
 end

data/lib/iron_chef/plugin.rb

@@ -121,7 +121,7 @@ module IronChef
         }.merge(node_config['json'])
 
         node_dna_json_file = "./tmp/#{nodes_location}/#{node_config['node_name']}.json"
-        File.open(node_dna_json_file, "w") do |f|
+        File.open(node_dna_json_file, 'w') do |f|
           f.puts node_dna.to_json
         end
 
@@ -146,11 +146,11 @@ module IronChef
       solo_rb = <<-RUBY
       solo true
       chef_root = File.expand_path(File.dirname(__FILE__))
-      file_cache_path chef_root
+      file_cache_path '#{chef_file_cache_dir}'
       cookbook_path   [ #{cookbook_paths} ]
-      role_path       File.join(chef_root, "roles")
-      data_bag_path   File.join(chef_root, "data_bags")
-      json_attribs    File.join(chef_root, "node.json")
+      role_path       File.join(chef_root, 'roles')
+      data_bag_path   File.join(chef_root, 'data_bags')
+      json_attribs    File.join(chef_root, 'node.json')
       log_level "#{chef_log_level}".to_sym
       RUBY
       put solo_rb, "#{chef_destination}/solo.rb", :via => :scp
@@ -199,6 +199,9 @@ module IronChef
       run "mkdir -p #{chef_destination}"
       release_chef_client_lock
       run "chown -R $USER: #{chef_destination}"
+      run "mkdir -p #{chef_file_cache_dir}"
+    rescue
+      puts cyan_text('Try running `cap node_name chef:clear` to clear chef folders for this node.')
     end
 
     def why_run
@@ -227,7 +230,7 @@ fi
     end
 
     def release_chef_client_lock
-      run prepare_sudo_cmd("rm -f #{chef_destination}/chef-client-running.pid; true")
+      run prepare_sudo_cmd("rm -f #{chef_file_cache_dir}/chef-client-running.pid; true")
     end
 
     def prepare_sudo_cmd(cmd)
@@ -266,6 +269,10 @@ fi
     def red_text(text)
       "\033[0;31m#{text}\033[0m"
     end
+
+    def cyan_text(text)
+      "\033[0;36m#{text}\033[0m"
+    end
     
   end
 end

data/lib/iron_chef/tasks.rb

@@ -13,10 +13,9 @@ Capistrano::Configuration.instance.load do
   set :chef_stream_output, false
   set :chef_parallel_rsync, true
   set :chef_parallel_rsync_pool_size, 10
-  set :chef_syntax_check, false
   set :chef_write_to_file, nil
-  set :chef_runner, nil
   set :chef_lock_file, '/tmp/chef.lock'
+  set :chef_file_cache_dir, '/tmp/chef_cache'
   set :chef_nodes_dir, 'nodes'
   set :chef_data_bags_dir, 'data_bags'
   set :chef_environment_dir, 'environments'
@@ -60,6 +59,7 @@ Capistrano::Configuration.instance.load do
     desc "Clears the chef destination folder on the server."
     task :clear, :except => { :nochef => true } do
       run iron_chef.prepare_sudo_cmd("rm -rf #{chef_destination}/*")
+      run iron_chef.prepare_sudo_cmd("rm -rf #{chef_file_cache_dir}/*")
       iron_chef.unlock
     end
 

data/lib/iron_chef/version.rb

@@ -1,3 +1,3 @@
 module IronChef
-  VERSION = "0.0.10"
+  VERSION = '0.0.11'
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: iron_chef
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
+  prerelease: 
 platform: ruby
 authors:
 - Scott Rosenthal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.15.4
+        version: '2.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.15.4
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -66,25 +71,26 @@ files:
 homepage: https://github.com/scottvrosenthal/iron_chef
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Iron Chef makes cloud server provisioning with Chef Solo powerful and easy.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzczZmZjMTgxNjNlMWQwOGViOGMzNjkxOWFmNmMyNTMyM2FiNTQ3Mw==
-  data.tar.gz: !binary |-
-    MmQ2MzQ0ZWIwMjE5YmE3MTYxY2YyMDVjYTQ5OTQ4NDk4Y2IwN2QzMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWUxNjA3OTUyYWI5NGZjYTc2ODhkMzJiZDQ3NDgwM2MyNDY5MDNkYWNmNTVl
-    YzAyZTZmNmVkM2RkYmVhODc4NGEyZWVhOGM1NDRhODJlYTgxOWJlNjllYWYw
-    OGUxZjQ5MTczOTU2ZTQ5NTBjMWRmM2ZhZTgwYTY0YWNiNWMyZjU=
-  data.tar.gz: !binary |-
-    ZmUxNzA0ZDdhNGMxODdmYWYzMjVlYTJmNzZjMDU5MWVhN2ZhZDI1MzA0ODAz
-    YWZlOWI3YmE3OGI1ZTkwOGZiNjYyOGUzOTQ4ZjkxMmNkZTk0NmIzMzdiMDFl
-    NmJiZWJiMjJhZDI4YTc0M2Y1Y2MxYTYxODI0MDAyMzU3ZThmYzU=