spatula 0.0.1 → 0.0.2

data/README.textile

@@ -4,16 +4,26 @@ Spatula is a command line helper app for use with "Chef":http://www.opscode.com/
 
 Spatula is really, really alpha. It does not handle errors at all, but it works pretty well given that you hand it the correct input. Please give it a try and pretty please fork it and make it better.  
 
+h1. Installation
+
+You can get spatula from gemcutter.
+
+<pre>
+# Gemcutter:
+# Follow the instructions on http://gemcutter.org/ then...
+gem install spatula 
+</pre>
+
 h1. Usage
 
 Spatula currently supports 3 commands: search, show, and install.
 
 <pre>
-$ ruby spatula.rb search apache2
+$ spatula search apache2
 apache2 Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions
 ... more output ...
 
-$ ruby spatula.rb show apache2
+$ spatula show apache2
 name:   apache2
 average_rating: 
 category:       Web Servers
@@ -25,7 +35,7 @@ external_url:
 versions:       http://cookbooks.opscode.com/api/v1/cookbooks/apache2/versions/0_9_1
 description:    Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions
 
-$ ruby spatula.rb install apache2
+$ spatula install apache2
 ... downloads the apache2 cookbook and installs it into $(pwd)/cookbooks ...
 ... also creates a $(pwd)/cookbook_tarballs dir to store the download ...
 </pre>

data/bin/spatula

@@ -7,5 +7,5 @@ rescue LoadError
   require 'spatula'
 end
 
-Spatula.run
+Spatula::Spatula.run
 

data/lib/spatula/cook.rb

@@ -0,0 +1,31 @@
+module Spatula
+  # TODO: Set REMOTE_CHEF_PATH using value for file_cache_path
+  REMOTE_CHEF_PATH = "/tmp/chef-solo" # Where to find upstream cookbooks
+
+  class Cook
+    Spatula.register("cook", self)
+
+    def self.run(*args)
+      new(*args).run
+    end
+
+    def initialize(server, node, port=22)
+      @server = server
+      @node = node
+      @port = port
+    end
+
+    def run
+      sh "rake test"
+      sh "rsync -rlP --rsh=\"ssh -p#@port\" --delete --exclude '.*' ./ #@server:#{REMOTE_CHEF_PATH}"
+      sh "ssh -t -p #@port -A #@server \"cd #{REMOTE_CHEF_PATH}; sudo /var/lib/gems/1.8/bin/chef-solo -c config/solo.rb -j config/#@node.json \""
+    end
+
+    private
+      def sh(command)
+        stdout = `#{command}`
+        puts stdout
+        stdout
+      end
+  end
+end

data/lib/spatula/prepare.rb

@@ -0,0 +1,27 @@
+# Prepare :server: for chef solo to run on it
+module Spatula
+  class Prepare
+    Spatula.register("prepare", self)
+
+    def self.run(*args)
+      new(*args).run
+    end
+
+    def initialize(server, port=22)
+      @server = server
+      @port   = port
+    end
+
+    def run
+      sh %Q|ssh -t -p #@port #@server sudo aptitude -y install ruby rubygems rubygems1.8 irb ri libopenssl-ruby1.8 libshadow-ruby1.8 ruby1.8-dev gcc g++ rsync |
+      sh %Q|ssh -t -p #@port #@server sudo gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org|
+    end
+
+    private
+      def sh(command)
+        stdout = `#{command}`
+        puts stdout
+        stdout
+      end
+  end
+end

data/lib/spatula/search.rb

@@ -0,0 +1,26 @@
+# Search for cookbooks matching :query:
+module Spatula
+  class Search
+    Spatula.register("search", self)
+
+    def self.run(*args)
+      new(*args).run
+    end
+
+    def initialize(query, start=0, count=10)
+      @query = query
+      @start = start
+      @count = count
+    end
+
+    def run
+      url = URI.parse("%s/search?q=%s&start=%s&items=%s" % [BASE_URL, @query, @start, @count])
+      response = Net::HTTP.get(url)
+      items = JSON.parse(response)["items"]
+      items.each do |item|
+        puts [item["cookbook_name"], item["cookbook_description"], item["cookbook_maintainer"]].join("\t")
+      end
+    end
+  end
+end
+

data/lib/spatula.rb

@@ -3,63 +3,134 @@ require 'net/http'
 require 'uri'
 require 'json'
 
-class Spatula
+module Spatula
   BASE_URL = "http://cookbooks.opscode.com/api/v1"
 
-  def self.run
-    command = ARGV.shift
-    Spatula.new.send(command, *ARGV)
-  end
+  class Spatula
+    @commands = {}
 
-  # Search for cookbooks matching :query:
-  def search(query, start=0, items=10)
-    url = URI.parse("%s/search?q=%s&start=%s&items=%s" % [BASE_URL, query, start, items])
-    response = Net::HTTP.get(url)
-    items = JSON.parse(response)["items"]
-    items.each do |item|
-      puts [item["cookbook_name"], item["cookbook_description"], item["cookbook_maintainer"]].join("\t")
+    def self.register(command, klass)
+      @commands[command] = klass
     end
-  end
-
-  # Show the cookbook named :name:
-  def show(name)
-    print_response(get_cookbook_info(name))
-  end
 
-  # Show the latest version of the cookbook named :name:
-  def show_latest_version(name)
-    print_response(get_version_info(name))
-  end
+    def self.run
+      command = ARGV.shift
+      if klass = @commands[command]
+        klass.run(*ARGV)
+      else
+        Spatula.new.send(command, *ARGV)
+      end
+    end
 
-  # Install the cookbook :name: into cwd/cookbooks
-  #   Will create a cookbook_tarballs dir for storing downloaded tarballs
-  def install(name)
-    file = JSON.parse(get_version_info(name))["file"]
-    filename = File.basename(file)
-    FileUtils.mkdir_p("cookbook_tarballs")
-    `curl #{file} -o cookbook_tarballs/#{filename}`
-    `tar xzvf cookbook_tarballs/#{filename} -C cookbooks`
-  end
+    # Show the cookbook named :name:
+    def show(name)
+      print_response(get_cookbook_info(name))
+    end
 
-  private
-    def get_cookbook_info(name)
-      url = URI.parse("%s/cookbooks/%s" % [BASE_URL, name])
-      Net::HTTP.get(url)
+    # Show the latest version of the cookbook named :name:
+    def show_latest_version(name)
+      print_response(get_version_info(name))
     end
 
-    def get_version_info(name)
-      latest = JSON.parse(get_cookbook_info(name))["latest_version"]
-      response = Net::HTTP.get(URI.parse(latest))
+    # Install the cookbook :name: into cwd/cookbooks
+    #   Will create a cookbook_tarballs dir for storing downloaded tarballs
+    def install(name)
+      file = JSON.parse(get_version_info(name))["file"]
+      filename = File.basename(file)
+      FileUtils.mkdir_p("cookbook_tarballs")
+      `curl #{file} -o cookbook_tarballs/#{filename}`
+      `tar xzvf cookbook_tarballs/#{filename} -C cookbooks`
     end
 
-    def print_response(response)
-      item = JSON.parse(response)
-      item.each_pair do |k, v|
-        puts "#{k}:\t#{v}"
+    private
+      def strict_system *cmd
+        cmd.map! &:to_s
+        result = []
+
+        trace = cmd.join(' ')
+        warn trace if $TRACE
+
+        pid, inn, out, err = popen4(*cmd)
+
+        inn.sync   = true
+        streams    = [out, err]
+        out_stream = {
+          out => $stdout,
+          err => $stderr,
+        }
+
+        out_stream_buffers = {
+          out => "",
+          err => ""
+        }
+
+        # Handle process termination ourselves
+        status = nil
+        Thread.start do
+          status = Process.waitpid2(pid).last
+        end
+
+        until streams.empty? do
+          # don't busy loop
+          selected, = select streams, nil, nil, 0.1
+
+          next if selected.nil? or selected.empty?
+
+          selected.each do |stream|
+            if stream.eof? then
+              streams.delete stream if status # we've quit, so no more writing
+              next
+            end
+
+            data = stream.readpartial(1024)
+            out_stream[stream].write data
+            out_stream_buffers[stream] << data
+
+            if stream == err and out_stream_buffers[stream] =~ /password(?:for)?.*:/i then
+              out_stream_buffers[stream] = ""
+              inn.puts @password
+              data << "\n"
+              $stderr.write "\n"
+            end
+
+            result << data
+          end
+        end
+
+        unless status.success? then
+          raise "execution failed with status #{status.exitstatus}: #{cmd.join ' '}"
+        end
+
+        result.join
+      ensure
+        inn.close rescue nil
+        out.close rescue nil
+        err.close rescue nil
       end
-    end
+
+      def get_cookbook_info(name)
+        url = URI.parse("%s/cookbooks/%s" % [BASE_URL, name])
+        Net::HTTP.get(url)
+      end
+
+      def get_version_info(name)
+        latest = JSON.parse(get_cookbook_info(name))["latest_version"]
+        response = Net::HTTP.get(URI.parse(latest))
+      end
+
+      def print_response(response)
+        item = JSON.parse(response)
+        item.each_pair do |k, v|
+          puts "#{k}:\t#{v}"
+        end
+      end
+  end
 end
 
+require 'spatula/search'
+require 'spatula/prepare'
+require 'spatula/cook'
+
 if __FILE__ == $0
-  Spatula.run
+  Spatula::Spatula.run
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spatula
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 -05:00
+date: 2010-02-21 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +29,9 @@ extra_rdoc_files: []
 files: 
 - README.textile
 - bin/spatula
+- lib/spatula/cook.rb
+- lib/spatula/prepare.rb
+- lib/spatula/search.rb
 - lib/spatula.rb
 has_rdoc: true
 homepage: http://trottercashion.com
@@ -38,18 +46,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Command line helper app for use with Chef