spatula 0.0.8 → 0.0.9

data/lib/spatula.rb

@@ -22,7 +22,7 @@ module Spatula
     def install(name)
       file = JSON.parse(get_version_info(name))["file"]
       filename = File.basename(file)
-      # Use ENV['HOME'] as the base here 
+      # Use ENV['HOME'] as the base here
       tarball_dir = "#{ENV['HOME']}/.spatula/cookbook_tarballs"
       FileUtils.mkdir_p(tarball_dir)
       system "curl #{file} -o #{tarball_dir}/#{filename}"
@@ -36,11 +36,12 @@ module Spatula
     end
 
     desc "cook SERVER NODE", "Cook SERVER with the specification in config/NODE.js. Use local as the server to cook this box."
-    method_options :port => nil 
+    method_options :port => nil
     method_options :login    => nil
     method_options :identity => nil
+    method_options :log_level => nil
     def cook(server, node)
-      Cook.run(server, node, options[:port], options[:login], options[:identity])
+      Cook.run(server, node, options[:port], options[:login], options[:identity], options[:log_level])
     end
 
     desc "prepare SERVER", "Install software/libs required by chef on SERVER"

data/lib/spatula/cook.rb

@@ -3,9 +3,10 @@ module Spatula
   REMOTE_CHEF_PATH = "/tmp/chef-solo" # Where to find upstream cookbooks
 
   class Cook < SshCommand
-    def initialize(server, node, port=nil, login=nil, identity=nil)
+    def initialize(server, node, port=nil, login=nil, identity=nil, log_level=nil)
       super(server, port, login, identity)
       @node = node
+      @log_level = log_level
     end
 
     def run
@@ -14,6 +15,16 @@ module Spatula
         raise "Syntax error in #{recipe}" if not ok
       end
 
+      Dir["**/*.json"].each do |json|
+        begin
+          require 'json'
+          # parse without instantiating Chef classes
+          JSON.parse File.read(json), :create_additions => false
+        rescue => error
+          raise "Syntax error in #{json}: #{error.message}"
+        end
+      end
+
       if @server =~ /^local$/i
         sh chef_cmd
       else
@@ -24,7 +35,7 @@ module Spatula
 
     private
       def chef_cmd
-        "sudo chef-solo -c config/solo.rb -j config/#@node.json"
+        "sudo chef-solo -c config/solo.rb -j config/#@node.json -l #{ @log_level || 'info'}"
       end
   end
 end

data/lib/spatula/prepare.rb

@@ -15,6 +15,8 @@ module Spatula
         "debian"
       when /fedora/i
         "fedora"
+      when /CentOS/i
+        "centos"
       when ""
         raise "Couldn't get system info from /etc/issue. Please check your SSH credentials."
       else
@@ -23,29 +25,47 @@ module Spatula
     end
 
     def run_for_ubuntu
-      ssh "sudo apt-get update"
-      ssh "sudo aptitude -y install ruby irb ri libopenssl-ruby1.8 libshadow-ruby1.8 ruby1.8-dev gcc g++ rsync curl"
-      ssh "curl -L 'http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz' | tar xvzf -"
-      ssh "cd rubygems* && sudo ruby setup.rb --no-ri --no-rdoc"
-      ssh "sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem"
-
-      ssh "sudo gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
+      ssh "#{sudo} apt-get update"
+      ssh "#{sudo} apt-get install -y ruby irb ri libopenssl-ruby1.8 libshadow-ruby1.8 ruby1.8-dev gcc g++ rsync curl"
+      install_rubygems
+      install_chef
     end
 
     def run_for_debian
-      ssh 'sudo apt-get update'
-      ssh 'sudo apt-get install -y build-essential zlib1g-dev libssl-dev libreadline5-dev curl rsync screen vim'
-      ssh 'curl -L http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz | tar xzvf -'
-      # install REE 1.8.7 (and rubygems and irb and rake) to /usr
-      ssh 'cd ruby-enterprise-1.8.7-2010.02 && sudo echo -e "\n/usr\n" | ./installer'
-
-      ssh "sudo gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
+      ssh "#{sudo} apt-get update"
+      ssh "#{sudo} apt-get install -y build-essential zlib1g-dev libssl-dev libreadline5-dev curl rsync"
+      install_rubygems
+      install_chef
     end
 
     def run_for_fedora
       sudo = ssh('which sudo > /dev/null 2>&1') ? 'sudo' : ''
-      ssh "#{sudo} yum install -y make gcc rsync sudo openssl-devel rubygems ruby-devel ruby-shadow"
-      ssh "#{sudo} gem install chef --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
+      ssh "#{sudo} yum install -y make gcc rsync sudo openssl-devel rubygems ruby-devel ruby-shadow curl"
+    end
+
+    def run_for_centos
+      ssh "#{sudo} yum install -y make gcc rsync sudo openssl-devel curl"
+      install_ruby_1_9_2
+      install_chef
+    end
+
+    def install_ruby_1_9_2
+      ssh "curl -L 'ftp://ftp.ruby-lang.org//pub/ruby/1.9/ruby-1.9.2-p136.tar.gz' | tar xvzf -"
+      ssh "cd ruby-1.9.2-* && ./configure && make && #{sudo} make install"
+    end
+
+    def install_rubygems
+      ssh "curl -L 'http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz' | tar xvzf -"
+      ssh "cd rubygems* && #{sudo} ruby setup.rb --no-ri --no-rdoc"
+      ssh "#{sudo} ln -sfv /usr/bin/gem1.8 /usr/bin/gem"
+    end
+
+    def install_chef
+      ssh "#{sudo} gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
+    end
+
+    def sudo
+      ssh('which sudo > /dev/null 2>&1') ? 'sudo' : ''
     end
 
     def upload_ssh_key

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spatula
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2011-02-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 13
-        - 4
         version: 0.13.4
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 4
         version: 1.2.4
   type: :runtime
   version_requirements: *id002
@@ -77,21 +65,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command line helper app for use with Chef