chef-solo-wrapper 0.0.3 → 0.0.4

data/bin/cs

@@ -16,7 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CHEF_SOLO_WRAPPER_VERSION = '0.0.3'
+CHEF_SOLO_WRAPPER_VERSION = '0.0.4'
+COOKBOOKS_SRC_DEST = '/usr/src/chef-cookbooks'
 
 require 'rubygems'
 require 'trollop'
@@ -36,74 +37,84 @@ EOS
   opt :config,    "Use alternate Chef Solo configuration (default used, ~/solo.rb.)",     :short => "-c"                                        # flag --config, default false
   opt :json,      "Use alternate Chef Solo JSON data (default used, ~/node.json.)",       :short => "-j", :type => String                       # flag --json, default false
   opt :test,      "Tests requiring chef only plus implies a dry run",                     :short => "-t"                                        # flag --test, default false
-  opt :setup,     "Installs the Chef Rubygem."                                                                                                  # flag --test, default false
+  opt :setup,     "Installs the Chef Rubygem.",                                           :type => String                                       # flag --test, default false
+  opt :defaults,  "Setups up configuration for default/initial.",                         :default => false                                     # flag --test, default false
+  opt :fetch,     "Fetches cookbooks.",                                                   :short => "-f", :type => String                       # flag --fetch, default false
   opt :dry,       "Dry run only, don't run chef-solo.",                                   :short => "-d"                                        # flag --dry, default false
   opt :run,       "Use alernative run_list for chef-solo run.",                           :short => "-r", :type => String                       # flag --run, default false
   opt :write,     "Write back to local JSON file.",                                       :short => "-w"                                        # flag --write, default false
   opt :loglevel,  "The Chef log level to use: debug, info, warn, error, fatal",           :short => "-l", :default => "info", :type => String   # flag --loglevel, default info
   opt :verbose,   "Verbose mode.",                                                        :short => "-v"                                        # flag --verbose, default false
-  opt :debug,     "Debug mode."                                                                                                                 # flag --debug, default faulse
-  opt :help, 	  "Print usage info and exit.",                                       	  :short => "-h"
+  opt :debug,     "Debug mode.",                                                          :default => false                                     # flag --debug, default faulse
+  opt :archive,   "Checkout cookbooks in archive mode."                                                                                         # flag --debug, default faulse
+  opt :help, 	    "Print usage info and exit.",                                       	  :short => "-h"
 end
 puts "options: #{opts.to_json}" unless !(opts.verbose || opts.debug and !opts.help)
-puts 'chef-solo-wrapper '+CHEF_SOLO_WRAPPER_VERSION
+puts "chef-solo-wrapper #{CHEF_SOLO_WRAPPER_VERSION}"
+
+if opts[:defaults]
+  SETUP_DEFAULTS = true
+else
+  SETUP_DEFAULTS = false
+end
+
+if opts[:debug]
+  DEBUG = true
+else
+  DEBUG = false
+end
 
 solo = false
 server = false
 
-if opts.test
-  begin
-    puts 'Testing require of chef.'
-    require 'chef'
-  rescue
-    puts 'Failed to require Chef RubyGem!'
-    exit 1
-  end
-  puts 'Test passed.'
+json_file = '/etc/chef/node.json'
+solo_file = '/etc/chef/solo.rb'
+
+require File.join(File.dirname(__FILE__), '../lib/config_helper.rb')
+config = ConfigHelper.new(SETUP_DEFAULTS, DEBUG)
+
+# Test mode (exits after test)
+if opts[:test]
+  config.test_setup
   exit
 end
 
-if opts.setup
-  begin
-    puts 'Installing Chef RubyGem...'
-    system('gem install chef --no-rdoc --no-ri')
-  rescue
-    puts 'Failed to install Chef Rubygem!'
-    exit 1
+# Setup routines
+if opts[:setup]
+  case opts[:setup]
+    when 'chef'
+      config.install_chef
+    when 'rc'
+      config.install_rest_connection
+    when 'config'
+      config.setup_solo_rb(solo_file)
+    when 'node'
+      config.setup_node_json(json_file)
+    when 'all'
+      config.install_chef
+      config.install_rest_connection
+      config.setup_node_json(json_file)
+      config.setup_solo_rb(solo_file)
+    when 'show'
+      config.show(solo_file, json_file)
+      exit
   end
-  puts 'Chef successfully installed.'
-  puts 'Install rest_connection (y/n)?'
-  install_rc = false
-  install_rc = gets.chomp
-  ( puts 'Installing rest_connection RubyGem...'; system('gem install rest_connection --no-rdoc --no-ri') ) unless install_rc != 'y'
+  puts "\nSetup complete."
   exit
 end
 
-# ensure a solo.rb exists for run
-if File.file?('/etc/chef/solo.rb')
-  solo = '/etc/chef/solo.rb'
-else
-  puts '    DEBUG: /etc/chef/solo.rb: not found.' unless !opts.debug
-end
-if File.file?("#{ENV['HOME']}/solo.rb")
-  solo = "#{ENV['HOME']}/solo.rb"
-else
-  puts '    DEBUG: ~/solo.rb: not found.' unless !opts.debug
-end
-unless solo
-  puts 'FATAL: No solo.rb file found (see http://wiki.opscode.com/display/chef/Chef+Solo), exiting.'
-  exit 1
-else
-  puts "==> Using #{solo}." unless !opts.debug
-  if File.zero?(solo) then
-    puts "FATAL: #{solo} is empty, exiting."
-    exit 1
-  end 
-  puts File.new(solo, 'r').read unless !opts.debug
+# Fetch cookbooks option
+# e.g. cs --fetch git://github.com/flaccid/cookbooks_public.git
+if opts[:fetch]
+  require File.join(File.dirname(__FILE__), '../lib/cookbooks_fetcher.rb')
+  cookbooks_fetcher = CookbooksFetcher.new
+  cookbooks_fetcher.fetch(opts[:fetch], COOKBOOKS_SRC_DEST)
 end
 
+config.pre_checks
+
 # get json if available
-if opts.json
+if opts[:json]
   attributes = File.new(opts.json, "r").read
 else
   if File.file?('/etc/chef/node.json')
@@ -120,7 +131,7 @@ else
 end
 
 # when a rs server is specified
-if opts.server
+if opts[:server]
 
   # import rest_connection
   puts 'Importing RestConnection RubyGem.' unless !opts.verbose
@@ -193,12 +204,12 @@ if opts.write and server_attributes
 	fh.close
 end
 
-# prepare options
-chef_config = " -c #{opts.config}" unless !opts.config
-chef_json = " -j #{opts.json}" unless !opts.json
+# pre append options
+chef_config = " -c #{opts[:config]}" if opts[:config]
+chef_json = " -j #{opts[:json]}" if opts[:json]
 
-# depict if sandbox chef-solo binary is used
-if opts.sandbox
+# set the chef-solo command depending if rs sandbox
+if opts[:sandbox]
   cs = '/opt/rightscale/sandbox/bin/ruby /opt/rightscale/sandbox/bin/chef-solo'
 else
   cs = 'chef-solo'
@@ -206,21 +217,21 @@ end
 
 # build chef solo command
 cmd = "#{cs}#{chef_config}#{chef_json} --log_level #{opts.loglevel} || ( echo 'Chef run failed!'; cat /var/chef-solo/chef-stacktrace.out; exit 1 )"
-puts "    DEBUG: running #{cmd}" unless !opts.debug
+puts "    DEBUG: running #{cmd}" if opts[:debug]
 
 # import chef
-puts 'Importing Chef RubyGem.' unless !opts.verbose
+puts 'Importing Chef RubyGem.' if opts[:verbose]
 require 'chef'
 
 # prepend sudo if not run as root
 if Process.uid != 0 
+	puts "    DEBUG: Non-root user, appending sudo (#{cmd})." if opts[:debug]
 	cmd.insert(0, 'sudo ') 
-	puts "    DEBUG: Non-root user, appending sudo (#{cmd})." unless !opts.debug
 end
 
 # finally, run chef-solo
 puts 'Starting Chef Solo.' unless !(opts.verbose || opts.debug)
-unless opts.dry
+unless opts[:dry]
   system(cmd)
 else
   puts 'Dry run only, exiting.'

data/lib/config_helper.rb

@@ -0,0 +1,151 @@
+class ConfigHelper
+  # constructor method
+  def initialize(setup_defaults, debug)
+    @setup_defaults, @debug = setup_defaults, debug
+  end
+  
+  # accessor methods
+  def install_gem(gem)
+    install_opts = '--no-rdoc --no-ri'
+    system("gem install #{gem} #{install_opts}")
+    Gem.clear_paths
+  end
+  
+  def show(solo_file, json_file)
+    puts
+    puts '* Chef Solo Setup *'
+    puts 
+    puts "#{solo_file}:"
+    puts '--'
+    puts File.open(solo_file, "r").read
+    puts '--'
+    puts
+    puts "#{json_file}:"
+    puts '--'
+    puts File.open(json_file, "r").read
+    puts '--'
+    puts
+ end
+      
+  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!'
+    end
+    puts
+  end
+  
+  def setup_solo_rb(file, auto=@setup_defaults)
+    puts "=> Setting up #{file}."
+    if auto
+      default_solo = true
+    else
+      puts '  Use default solo.rb [y/n] <enter> ?'
+      default_solo = false
+      default_solo = gets.chomp
+    end
+    if default_solo
+      File.open(file, "w") {|f| f.write 'file_cache_path "/var/chef-solo"'+"\n"+'cookbook_path [ "/usr/src/chef-cookbooks/default" ]'+"\n"'json_attribs "/etc/chef/node.json"'+"\n"}
+      system("mkdir -p /usr/src/chef-cookbooks/default")
+      File.new('/usr/src/chef-cookbooks/default/chefignore', "w").close
+      return
+    end
+    puts "  Type or paste your solo.rb (type EOF then press <enter> to finish):"
+    $/ = "EOF"
+    stdin = STDIN.gets
+    File.open(file, "w") {|f| f.write stdin }
+  end
+
+  def setup_node_json(file, auto=@setup_defaults)
+    puts "=> Setting up #{file}."
+    if auto
+      create_empty = 'y'
+    else
+      puts '  Create empty node.json [y/n] <enter> ?'
+      create_empty = 'n'
+      create_empty = gets.chomp
+    end
+    if create_empty.downcase == 'y'
+      json = '{}'
+    else
+      puts "  Type or paste your node.json (type EOF then press <enter> to finish):"
+      $/ = "EOF"
+      json = STDIN.gets
+    end
+    File.open(file, "w") {|f| f.write json.gsub('EOF', '')}
+  end
+
+  def install_rest_connection(auto=false)
+    puts '=> Setting up rest_connection.'
+    begin
+      if auto or @setup_defaults
+        install_rc = 'y'
+      else
+        puts '  Install rest_connection [y/n] <enter> ?'
+        install_rc = 'n'
+        install_rc = gets.chomp
+      end
+      if install_rc.downcase == 'y'
+        puts 'Installing rest_connection RubyGem...'
+        gem = 'rest_connection'
+        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 rest_connection!'
+        end
+      end
+    end
+    puts
+  end
+
+  def test_setup
+    begin
+      puts 'Testing require of chef.'
+      require 'chef'
+    rescue
+      puts 'Failed to require Chef RubyGem!'
+      exit 1
+    end
+    puts 'Test passed.'
+    exit
+  end
+  
+  def pre_checks
+    # ensure a solo.rb exists for run
+    if File.file?('/etc/chef/solo.rb')
+      solo = '/etc/chef/solo.rb'
+    else
+      puts '    DEBUG: /etc/chef/solo.rb: not found.' if @debug
+    end
+    if File.file?("#{ENV['HOME']}/solo.rb")
+      solo = "#{ENV['HOME']}/solo.rb"
+    else
+      puts '    DEBUG: ~/solo.rb: not found.' if @debug
+    end
+    unless solo
+      puts 'FATAL: No solo.rb file found (see http://wiki.opscode.com/display/chef/Chef+Solo), exiting.'
+      exit 1
+    else
+      puts "==> Using #{solo}." if @debug
+      if File.zero?(solo) then
+        puts "FATAL: #{solo} is empty, exiting."
+        exit 1
+      end 
+      puts File.new(solo, 'r').read if @debug
+    end
+  end
+
+end

data/lib/cookbooks_fetcher.rb

@@ -0,0 +1,22 @@
+class CookbooksFetcher
+  # constructor method
+  def initialize()
+    
+  end
+  
+  def fetch(cookbooks_src, cookbooks_dest, archive=true)
+    if Process.uid != 0
+       cookbooks_dest = "#{File.expand_path("~")}/chef-cookbooks"
+    end
+    system("mkdir -p #{cookbooks_dest}")
+    puts "Cookbooks destination: #{cookbooks_dest}."
+    if archive
+       system("cd #{cookbooks_dest}; git clone --depth=1 #{cookbooks_src}")
+       #system("git archive --format=tar --remote=#{opts[:fetch]} master | tar -xf -")
+    else
+      system("cd #{cookbooks_dest}; git clone #{cookbooks_src}")
+    end
+    exit
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-solo-wrapper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Fordham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-02 00:00:00 Z
+date: 2012-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -31,6 +31,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: A basic wrapper for chef-solo with RightScale integration.
 email: chris@xhost.com.au
 executables: 
@@ -40,6 +54,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/config_helper.rb
+- lib/cookbooks_fetcher.rb
 - bin/cs
 homepage: https://github.com/flaccid/chef-solo-wrapper
 licenses: []