spatula 0.0.3 → 0.0.4

data/bin/spatula

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

data/lib/spatula/cook.rb

@@ -3,8 +3,6 @@ module Spatula
   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

data/lib/spatula/prepare.rb

@@ -1,8 +1,6 @@
 # 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

data/lib/spatula/search.rb

@@ -1,8 +1,6 @@
 # Search for cookbooks matching :query:
 module Spatula
   class Search
-    Spatula.register("search", self)
-
     def self.run(*args)
       new(*args).run
     end

data/lib/spatula.rb

@@ -2,112 +2,52 @@ require 'rubygems'
 require 'net/http'
 require 'uri'
 require 'json'
+require 'thor'
 
 module Spatula
   BASE_URL = "http://cookbooks.opscode.com/api/v1"
 
-  class Spatula
-    @commands = {}
-
-    def self.register(command, klass)
-      @commands[command] = klass
-    end
-
-    def self.run
-      command = ARGV.shift
-      if klass = @commands[command]
-        klass.run(*ARGV)
-      else
-        Spatula.new.send(command, *ARGV)
-      end
-    end
-
-    # Show the cookbook named :name:
+  class Spatula < Thor
+    desc "show COOKBOOK", "Show information about a cookbook"
     def show(name)
       print_response(get_cookbook_info(name))
     end
 
-    # Show the latest version of the cookbook named :name:
+    desc "show_latest_version COOKBOOK", "Show the latest version for a cookbook"
     def show_latest_version(name)
       print_response(get_version_info(name))
     end
 
-    # Install the cookbook :name: into cwd/cookbooks
-    #   Will create a cookbook_tarballs dir for storing downloaded tarballs
+    desc "install COOKBOOK", "Install the latest version of COOKBOOK into ./cookbooks"
     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`
+      # 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}"
+      system "tar xzvf #{tarball_dir}/#{filename} -C cookbooks"
     end
 
-    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
+    desc "search QUERY", "Search cookbooks.opscode.com for cookbooks matching QUERY"
+    method_options :start => 0, :count => 10
+    def search(query)
+      Search.run(query, options[:start], options[:count])
+    end
 
-        unless status.success? then
-          raise "execution failed with status #{status.exitstatus}: #{cmd.join ' '}"
-        end
+    desc "cook SERVER NODE", "Cook SERVER with the specification in config/NODE.js"
+    method_options :port => 22
+    def cook(server, node)
+      Cook.run(server, node, options[:port])
+    end
 
-        result.join
-      ensure
-        inn.close rescue nil
-        out.close rescue nil
-        err.close rescue nil
-      end
+    desc "prepare SERVER", "Install software/libs required by chef on SERVER"
+    method_options :port => 22
+    def prepare(server)
+      Prepare.run(server, port)
+    end
 
+    private
       def get_cookbook_info(name)
         url = URI.parse("%s/cookbooks/%s" % [BASE_URL, name])
         Net::HTTP.get(url)
@@ -127,10 +67,14 @@ module Spatula
   end
 end
 
+if __FILE__ == $0
+  $: << File.dirname(__FILE__)
+end
+
 require 'spatula/search'
 require 'spatula/prepare'
 require 'spatula/cook'
 
 if __FILE__ == $0
-  Spatula::Spatula.run
+  Spatula::Spatula.start
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spatula
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -41,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