cliaws 1.4.2 → 1.5.0

data/lib/cliaws/cli/s3.rb

@@ -0,0 +1,172 @@
+require "thor"
+require "cliaws"
+
+module Cliaws
+	module Cli
+		class S3 < Thor
+			map ["-h", "--help"] => :help
+
+			desc "url S3_OBJECT_PATH", <<EOD
+Returns a signed, private, URL to the given S3 object that is valid for 24 hours.
+EOD
+			def url(s3_object)
+				puts Cliaws.s3.url(s3_object)
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "list [S3_OBJECT_PATH_PREFIX]", <<EOD
+Lists all S3 objects that start with the given string.
+
+EXAMPLES
+
+If the bucket named "vacation" contains the files "movies/arrival.mp4",
+"movies/at_the_ball.mp4" and "photos/johnson_and_us.jpg", then:
+
+$ clis3 list vacation/movies
+movies/arrival.mp4
+movies/at_the_ball.mp4
+
+$ clis3 list vacation
+movies/arrival.mp4
+movies/at_the_ball.mp4
+photos/johnson_and_us.jpg
+
+$ clis3 list vacation/p
+photos/johnson_and_us.jpg
+EOD
+			def list(prefix="")
+				puts Cliaws.s3.list(prefix)
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "touch S3_OBJECT_PATH", <<EOD
+Creates or OVERWRITES a named file at the specified path.
+
+WARNING: If the file already exists, IT WILL BE OVERWRITTEN with no content.
+EOD
+			def touch(s3_object)
+				Cliaws.s3.put("", s3_object)
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "put [LOCAL_FILE [LOCAL_FILE ...]] S3_PATH", <<EOD
+Puts one or more named local files, or a simple string, to a path.
+
+This method has the same interface as cp(1).
+
+EXAMPLES
+
+$ clis3 put --data "123 Grand St / Old Orchard Beach" vacation/2009/where.txt
+$ clis3 put photos/phil_johnson.jpg vacation/2009/phil_johnson.jpg
+$ clis3 put photos/peter.jpg photos/sarah.jpg vacation/2009/photos/hosts
+$ clis3 put movies vacation/2009/movies
+EOD
+      method_options :data => :optional
+			def put(*args)
+				paths = args
+				s3_object = paths.pop
+
+				single_put_mapper = lambda do |source, s3_path|
+					raise ArgumentError, "Writing directly from STDIN is forbidden when STDIN's size is unknown.  The RightAws library will write a zero-byte file to Amazon's servers." unless source.respond_to?(:lstat) || source.respond_to?(:size)
+					s3_path
+				end
+
+				multi_put_mapper  = lambda do |source, s3_path|
+					if source.respond_to?(:path) then
+						File.join(s3_path, File.basename(source.path))
+					else
+						raise ArgumentError, "Cannot write to a directory when one or more sources are not files: #{source.inspect}"
+					end
+				end
+
+				if options[:data] && !paths.empty? then
+					raise ArgumentError, "Cannot specify both --data and filename(s) to send."
+				elsif options[:data] then
+					sources = [StringIO.new(options[:data])]
+					mapper  = single_put_mapper
+				elsif paths == ["-"] then
+					sources = [STDIN]
+					mapper  = single_put_mapper
+				else
+					targets = paths.map {|filename| filename.to_s}
+					case targets.length
+					when 0
+						sources = [STDIN]
+						mapper  = single_put_mapper
+					when 1
+						sources = targets.map {|target| File.open(target, "rb")}
+						mapper  = single_put_mapper
+					else
+						sources = targets.map {|target| File.open(target, "rb")}
+						mapper  = multi_put_mapper
+					end
+				end
+
+				sources.each do |source|
+					target = mapper.call(source, s3_object)
+					if source.respond_to?(:path) then
+						puts "#{source.path} => #{target}"
+					else
+						puts "STDIN => #{target}"
+					end
+
+					Cliaws.s3.put(source, target)
+				end
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "rm S3_OBJECT [S3_OBJECT ...]", <<EOD
+Deletes one or more S3 objects.
+
+Does not accept wildcards: each path to delete must be named individually.
+EOD
+			def rm(*paths)
+				paths.each do |path|
+					puts "rm #{path}"
+					Cliaws.s3.rm(path)
+				end
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "cat S3_OBJECT", <<EOD
+Prints the contents of the named object to STDOUT.
+A single new line (\n) will be appended to the output.
+EOD
+			def cat(s3_object)
+				print Cliaws.s3.get(s3_object, STDOUT)
+				puts
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "get S3_OBJECT [LOCAL_FILE]", <<EOD
+Returns the raw contents of the named object.
+
+If LOCAL_FILE is unspecified, it will default to STDOUT.
+EOD
+			def get(s3_object, local_path=nil)
+				out = if local_path then
+								File.open(local_path, "wb")
+							else
+								STDOUT
+							end
+
+				Cliaws.s3.get(s3_object, out)
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+
+			desc "head S3_OBJECT", "Returns a YAML representation of meta data that Amazon keeps about the named object"
+			def head(s3_object)
+				puts Cliaws.s3.head(s3_object).to_yaml
+			rescue Cliaws::S3::UnknownBucket
+				abort "Could not find bucket named #{$!.bucket_name}"
+			end
+		end
+	end
+end

data/lib/cliaws/cli/sqs.rb

@@ -0,0 +1,73 @@
+require "thor"
+require "cliaws"
+
+module Cliaws
+  module Cli
+    class Sqs < Thor
+      map  %w(-h --help -H) => :help
+      map "peek" => :receive
+
+      desc "create QUEUE_NAME", "Creates a new queue with the specified name."
+      def create(queue_name)
+        Cliaws.sqs.create(queue_name)
+        puts "Created #{queue_name}"
+      end
+
+      desc "delete QUEUE_NAME", "Deletes the named queue."
+      method_options :force => :boolean
+      def delete(queue_name)
+        Cliaws.sqs.delete(queue_name, options[:force])
+        puts "Queue #{queue_name} deleted"
+      end
+
+      desc "list [PREFIX]", "Lists your queues, only if they match PREFIX."
+      def list(prefix=nil)
+        puts Cliaws.sqs.list(prefix).map {|q| q.name}
+      end
+
+      desc "size QUEUE_NAME", "Prints the number of items in the queue to STDOUT."
+      def size(queue_name)
+        puts Cliaws.sqs.size(queue_name)
+      end
+
+      desc "receive QUEUE_NAME", "Prints a message from the queue to STDOUT.  This is also known as peeking."
+      def receive(queue_name)
+        message = Cliaws.sqs.receive(queue_name)
+        puts message if message
+      end
+
+      desc "pop QUEUE_NAME", "Prints a message from the queue to STDOUT, and removes it from the queue."
+      def pop(queue_name)
+        message = Cliaws.sqs.pop(queue_name)
+        puts message if message
+      end
+
+      desc "push QUEUE_NAME [LOCAL_FILE]", <<EOD
+Pushes a new message to the named queue.
+
+Reads STDIN if LOCAL_FILE and --data are absent.
+EOD
+      method_options :data => :optional
+      def push(queue_name, local_file=nil)
+        raise ArgumentError, "Cannot give both --data and LOCAL_FILE" if options[:data] && local_file
+        data = case
+               when local_file
+                 File.read(local_file)
+               when options[:data]
+                 options[:data]
+               else
+                 STDIN.read
+               end
+        Cliaws.sqs.push(queue_name, data)
+        puts "Pushed #{data.size} bytes to queue #{queue_name}"
+      end
+
+      desc "info QUEUE_NAME", "Returns information about the named queue, as a YAML document."
+      def info(queue_name)
+        info = Cliaws.sqs.info(queue_name)
+        data = {"Visibility" => info[:visibility_timeout], "Number of messages" => info[:size]}
+        puts data.to_yaml
+      end
+    end
+  end
+end

data/lib/cliaws/ec2.rb

@@ -13,7 +13,45 @@ module Cliaws
       ec2.describe_instances.map {|raw_data| Instance.new(raw_data)}
     end
 
+    def run(ami, options={})
+      raw_data = ec2.launch_instances(ami,
+                           :min_count     => options[:count],
+                           :max_count     => options[:count],
+                           :key_name      => options[:keypair],
+                           :instance_type => options[:type])
+      raw_data.map {|data| Instance.new(data)}
+    end
+
+    def terminate(instance_ids)
+      raw_data = ec2.terminate_instances(instance_ids)
+      raw_data.map {|data| Instance.new(data)}
+    end
+
+    def allocate_address
+      ec2.allocate_address
+    end
+
+    def deallocate_address(address)
+      ec2.release_address(address)
+    end
+
+    def associate_address(options)
+      ec2.associate_address(options[:instance], options[:address])
+    end
+
+    def disassociate_address(address)
+      ec2.disassociate_address(address)
+    end
+
+    def describe_addresses
+      ec2.describe_addresses.inject([]) do |memo, hash|
+        memo << {"instance_id" => hash[:instance_id], "address" => hash[:public_ip]}
+      end
+    end
+
     class Instance
+      attr_reader :raw_data
+
       def initialize(raw_data)
         @raw_data = raw_data
       end

data/lib/cliaws/s3.rb

@@ -1,11 +1,5 @@
 require "right_aws"
 
-# Load vendor code through RubyGems
-require "right_http_connection"
-
-# Then patch it here
-require File.dirname(__FILE__) + "/../../vendor/right_http_connection-1.2.1/lib/right_http_connection"
-
 module Cliaws
   class S3
     attr_reader :access_key_id, :secret_access_key
@@ -41,7 +35,7 @@ module Cliaws
       bucket, keyname = bucket_and_key_name(s3_object)
       key = bucket.key(keyname, true)
       headers = key.headers
-      puts headers.merge(key.meta_headers).to_yaml
+      headers.merge(key.meta_headers)
     end
 
     def put(source, s3_object, create=true)

data/lib/cliaws/sqs.rb

@@ -3,12 +3,12 @@ require "right_aws"
 module Cliaws
   class Sqs
     def initialize(access_key_id, secret_access_key)
-      @sqs = RightAws::Sqs.new(access_key_id, secret_access_key, :logger => Logger.new("/dev/null"))
+      @sqs = RightAws::SqsGen2.new(access_key_id, secret_access_key, :logger => Logger.new("/dev/null"))
     end
 
     # Gets a message from the queue, but doesn't delete it.
     def receive(qname)
-      q(qname).receive(qname).to_s
+      q(qname).receive
     end
 
     # Adds a message in the queue.
@@ -18,7 +18,7 @@ module Cliaws
 
     # Gets and deletes message.
     def pop(qname)
-      q(qname).pop.to_s
+      q(qname).pop
     end
 
     # Fetches a number of messages.
@@ -33,7 +33,7 @@ module Cliaws
 
     # Lists the created queues.
     def list(prefix=nil)
-      @sqs.queues(prefix).map {|q| q.name}
+      @sqs.queues(prefix)
     end
 
     # Creates a queue

data/lib/cliaws.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require "cliaws/s3"
 require "cliaws/sqs"
 require "cliaws/ec2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -05:00
+date: 2009-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: main
+  name: thor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.8"
+        version: "0.9"
     version: 
 - !ruby/object:Gem::Dependency 
   name: right_aws
@@ -30,69 +30,45 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.8"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: "1.10"
     version: 
 description: A command-line suite of tools to access Amazon Web Services, using the RightAws gems.
-email: 
-- francois@teksol.info
+email: francois@teksol.info
 executables: 
-- cliec2
 - clis3
 - clisqs
+- cliec2
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
 - License.txt
-- Manifest.txt
-- README.txt
-- vendor/right_http_connection-1.2.1/README.txt
 files: 
 - .gitignore
 - History.txt
 - License.txt
-- Manifest.txt
 - README.txt
 - Rakefile
+- VERSION
 - bin/cliec2
 - bin/clis3
+- bin/clisdb
 - bin/clisqs
 - cliaws.gemspec
-- config/hoe.rb
-- config/requirements.rb
 - lib/cliaws.rb
+- lib/cliaws/cli/ec2.rb
+- lib/cliaws/cli/s3.rb
+- lib/cliaws/cli/sqs.rb
 - lib/cliaws/ec2.rb
 - lib/cliaws/s3.rb
 - lib/cliaws/sqs.rb
-- lib/cliaws/version.rb
-- log/.gitignore
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- test/test_cliaws.rb
-- test/test_helper.rb
-- vendor/right_http_connection-1.2.1/README.txt
-- vendor/right_http_connection-1.2.1/lib/right_http_connection.rb
 has_rdoc: true
-homepage: http://cliaws.rubyforge.org
+homepage: http://cliaws.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -110,10 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cliaws
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A command-line suite of tools to access Amazon Web Services, using the RightAws gems.
-test_files: 
-- test/test_cliaws.rb
-- test/test_helper.rb
+test_files: []
+

data/Manifest.txt

@@ -1,29 +0,0 @@
-.gitignore
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/cliec2
-bin/clis3
-bin/clisqs
-cliaws.gemspec
-config/hoe.rb
-config/requirements.rb
-lib/cliaws.rb
-lib/cliaws/ec2.rb
-lib/cliaws/s3.rb
-lib/cliaws/sqs.rb
-lib/cliaws/version.rb
-log/.gitignore
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-test/test_cliaws.rb
-test/test_helper.rb
-vendor/right_http_connection-1.2.1/README.txt
-vendor/right_http_connection-1.2.1/lib/right_http_connection.rb

data/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'cliaws/version'
-
-AUTHOR = 'François Beausoleil'  # can also be an array of Authors
-EMAIL = "francois@teksol.info"
-DESCRIPTION = "A command-line suite of tools to access Amazon Web Services, using the RightAws gems."
-GEM_NAME = 'cliaws' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'cliaws' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = YAML.load(`svn info`)['Revision']
-VERS = Cliaws::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'cliaws documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [
-    ["main", "~> 2.8"],
-    ["right_aws", "~> 1.8"]
-  ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'

data/config/requirements.rb

@@ -1,15 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/lib/cliaws/version.rb

@@ -1,9 +0,0 @@
-module Cliaws #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 4
-    TINY  = 2
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/cliaws.rb'}"
-puts "Loading cliaws gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)