chef-solo-wrapper 0.0.5 → 0.0.6

data/bin/cs

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CHEF_SOLO_WRAPPER_VERSION = '0.0.5'
+CHEF_SOLO_WRAPPER_VERSION = '0.0.6'
 COOKBOOKS_SRC_DEST = '/usr/src/chef-cookbooks'
 
 require 'rubygems'
@@ -147,7 +147,6 @@ end
 
 # when a rs server is specified
 if opts[:server]
-
   # import rest_connection
   puts 'Importing RestConnection RubyGem.' unless !opts.verbose
   require 'rest_connection'
@@ -193,9 +192,9 @@ if opts[:server]
     end
   }
   puts "    DEBUG:\n#{p server_attributes}" unless !opts.debug
-
 end
 
+# merge attributes
 if server_attributes
   puts server_attributes.to_json
   puts '    DEBUG: Merging attributes.' unless !opts.debug
@@ -204,19 +203,22 @@ else
   puts '    DEBUG: No server attributes to merge.' unless !opts.debug
 end
 
-if opts.run
-  # override runlist
-  attributes['run_list'] = "#{opts.run}"
+# override runlist
+if opts[:run]
+  attributes['run_list'] = "#{opts[:run]}"
 end
 
 # write attributes back to local node.json
-if opts.write and server_attributes
+if opts[:write] and server_attributes
 	node_json = JSON.pretty_generate(attributes)
-	puts "Node Attributes: \n #{node_json}" unless !opts.debug
-	# open file for write back
-	fh = File.new(node_file, "w")
-	fh.write(node_json)
-	fh.close
+	puts "    DEBUG: Node Attributes: \n #{node_json}" if opts[:debug]
+	puts "    DEBUG: Writing attributes to #{json_file}" if opts[:debug]
+	begin
+	  # open file for write back
+	  fh = File.new(json_file, "w")
+	  fh.write(node_json)
+	  fh.close
+	end
 end
 
 # pre append options
@@ -225,6 +227,7 @@ chef_json = " -j #{opts[:json]}" if opts[:json]
 
 # set the chef-solo command depending if rs sandbox
 if opts[:sandbox]
+  puts '    DEBUG: Using sandbox ruby/chef.' if opts[:debug]
   cs = '/opt/rightscale/sandbox/bin/ruby /opt/rightscale/sandbox/bin/chef-solo'
 else
   cs = 'chef-solo'
@@ -245,7 +248,7 @@ if Process.uid != 0
 end
 
 # finally, run chef-solo
-puts 'Starting Chef Solo.' unless !(opts.verbose || opts.debug)
+puts 'Starting Chef Solo.' unless !(opts[:verbose] || opts[:debug])
 unless opts[:dry]
   system(cmd)
 else

data/lib/config_helper.rb

@@ -30,18 +30,31 @@ class ConfigHelper
   def install_chef
     puts
     puts '=> Setting up Chef Solo.'
-    puts 'Installing Chef RubyGem...'
-    gem = 'chef'
-    begin
-       puts  "#{gem} already installed, version: #{Gem::Specification.find_by_name(gem).version}."
-    rescue Gem::LoadError
-      install_gem(gem)
-    rescue
-      install_gem(gem) unless Gem.available?(gem)
-    rescue
-      raise 'Failed to install Chef Rubygem!'
+    case "#{`lsb_release -si`.strip}"
+      when 'Ubuntu'
+        puts 'Ubuntu detected; installing from opscode apt.'
+        system("DEBIAN_FRONTEND=noninteractive")
+        system("sudo mkdir -p /etc/apt/trusted.gpg.d")
+        system("gpg --keyserver keys.gnupg.net --recv-keys 83EF826A")
+        system("gpg --export packages@opscode.com | sudo tee /etc/apt/trusted.gpg.d/opscode-keyring.gpg > /dev/null")
+        system('echo "deb http://apt.opscode.com/ $(lsb_release -cs)-0.10 main" > /etc/apt/sources.list.d/opscode.list')
+        system("sudo apt-get -y update")
+        system("sudo apt-get -y upgrade")
+        system("sudo apt-get -y install chef")
+        exit
+    else
+      puts 'Installing Chef RubyGem...'
+      gem = 'chef'
+      begin
+         puts  "#{gem} already installed, version: #{Gem::Specification.find_by_name(gem).version}."
+      rescue Gem::LoadError
+        install_gem(gem)
+      rescue
+        install_gem(gem) unless Gem.available?(gem)
+      rescue
+        raise 'Failed to install Chef Rubygem!'
+      end
     end
-    puts
   end
   
   def setup_solo_rb(file, auto=@setup_defaults)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-solo-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Chris Fordham