cliaws 1.4.2 → 1.5.0

data/.gitignore

@@ -1,3 +1,4 @@
 *.swp
 *.log
 pkg
+doc

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 FIXME full name
+Copyright (c) 2008 François Beausoleil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.txt

@@ -42,7 +42,6 @@ Cliaws may also be used from Ruby:
 == REQUIREMENTS:
 
 * main
-* activesupport
 * right_aws
 
 == INSTALL:

data/Rakefile

@@ -1,4 +1,50 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name              = "cliaws"
+    gemspec.rubyforge_project = gemspec.name
+    gemspec.email             = "francois@teksol.info"
+    gemspec.homepage          = "http://cliaws.rubyforge.org/"
+    gemspec.summary           = "A command-line suite of tools to access Amazon Web Services, using the RightAws gems."
+    gemspec.description       = gemspec.summary
+    gemspec.authors           = ["François Beausoleil"]
+    gemspec.executables       = %w(clis3 clisqs cliec2)
+    gemspec.extra_rdoc_files  = %w(History.txt License.txt vendor/right_http_connection-1.2.1/README.txt)
+
+    gemspec.add_dependency "thor", "~> 0.9"
+    gemspec.add_dependency "right_aws", "~> 1.10"
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/cliaws/"
+        local_dir = 'doc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
+task :rdoc do
+  rm_r "doc"
+  sh "rdoc --title 'Cliaws: Ruby command-line AWS client' --exclude=doc/"
+end

data/VERSION

@@ -0,0 +1 @@
+1.5.0

data/bin/cliec2

@@ -1,29 +1,3 @@
 #!/usr/bin/env ruby
-#
-#  Created on 2008-4-12.
-#  Copyright (c) 2008. All rights reserved.
-
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-
-require "main"
-
-$:.unshift File.dirname(__FILE__) + "/../lib"
-require "cliaws"
-
-Main {
-  mode("list") do
-    def run
-      instances = Cliaws.ec2.list
-      printf "%-50s %-12s %s\n", "DNS Name", "State", "Groups"
-      printf "-"*120
-      print "\n"
-      instances.each do |instance|
-        printf "%-50s %-12s %s\n", instance.public_dns_name, instance.state, instance.groups.join(", ")
-      end
-    end
-  end
-}
+require "cliaws/cli/ec2"
+Cliaws::Cli::Ec2.start

data/bin/clis3

@@ -1,186 +1,3 @@
 #!/usr/bin/env ruby
-#
-#  Created on 2008-4-12.
-#  Copyright (c) 2008. All rights reserved.
-
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-
-require "main"
-
-$:.unshift File.dirname(__FILE__) + "/../lib"
-require "cliaws"
-
-Main {
-  mixin :s3_object do
-    argument("s3_object") do
-      required
-      argument_required
-    end
-  end
-
-  mode("url") do
-    mixin :s3_object
-
-    def run
-      puts Cliaws.s3.url(params["s3_object"].value)
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("list") do
-    mixin :s3_object
-
-    def run
-      puts Cliaws.s3.list(params["s3_object"].value)
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("touch") do
-    mixin :s3_object
-
-    def run
-      Cliaws.s3.put("", params["s3_object"].value)
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("put") do
-    argument("files_or_s3_path") do
-      optional
-      argument_required
-      arity -2
-    end
-
-    option("data") do
-      optional
-      argument_required
-    end
-
-    def run
-      paths = params["files_or_s3_path"].values
-      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 params["data"].given? && !paths.empty? then
-        raise ArgumentError, "Cannot specify both --data and filename(s) to send."
-      elsif params["data"].given? then
-        sources = [StringIO.new(params["data"].value)]
-        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
-      exit_success!
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("rm") do
-    mixin :s3_object
-
-    def run
-      Cliaws.s3.rm(params["s3_object"].value)
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("cat") do
-    mixin :s3_object
-
-    def run
-      Cliaws.s3.get(params["s3_object"].value, STDOUT)
-      puts
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("get") do
-    mixin :s3_object
-
-    argument("local_file") do
-      argument_required
-      optional
-    end
-
-    def run
-      if params["local_file"].given? then
-        dest = File.open(params["local_file"].value, "wb")
-      else
-        dest = STDOUT
-      end
-
-      Cliaws.s3.get(params["s3_object"].value, dest)
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  mode("head") do
-    mixin :s3_object
-
-    def run
-      Cliaws.s3.head(params["s3_object"].value)
-
-    rescue Cliaws::S3::UnknownBucket
-      abort "Could not find bucket named #{$!.bucket_name}"
-    end
-  end
-
-  def run
-    abort "Required action argument missing.  Run '#{$0} help' for details."
-  end
-}
+require "cliaws/cli/s3"
+Cliaws::Cli::S3.start

data/bin/clisdb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+#
+#  Created on 2008-4-12.
+#  Copyright (c) 2008. All rights reserved.
+
+begin
+  require 'rubygems'
+rescue LoadError
+  # no rubygems to load, so we fail silently
+end
+
+require 'optparse'
+
+# NOTE: the option -p/--path= is given as an example, and should probably be replaced in your application.
+
+OPTIONS = {
+  :path     => '~'
+}
+MANDATORY_OPTIONS = %w(  )
+
+parser = OptionParser.new do |opts|
+  opts.banner = <<BANNER
+This application is wonderful because...
+
+Usage: #{File.basename($0)} [options]
+
+Options are:
+BANNER
+  opts.separator ""
+  opts.on("-p", "--path=PATH", String,
+          "The root path for selecting files",
+          "Default: ~") { |OPTIONS[:path]| }
+  opts.on("-h", "--help",
+          "Show this help message.") { puts opts; exit }
+  opts.parse!(ARGV)
+
+  if MANDATORY_OPTIONS && MANDATORY_OPTIONS.find { |option| OPTIONS[option.to_sym].nil? }
+    puts opts; exit
+  end
+end
+
+path = OPTIONS[:path]
+
+# do stuff

data/bin/clisqs

@@ -1,104 +1,3 @@
 #!/usr/bin/env ruby
-#
-#  Created on 2008-4-12.
-#  Copyright (c) 2008. All rights reserved.
-
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-
-require "main"
-require "cliaws"
-
-Main {
-  mixin(:qname) do
-    argument("queue_name") do
-      required
-      argument_required
-    end
-  end
-
-  mode("create") do
-    mixin :qname
-    description "Create a new queue"
-    def run
-      Cliaws.sqs.create(queue_name)
-      puts "Queue #{queue_name} was created."
-    end
-  end
-
-  mode("delete") do
-    mixin :qname
-    description "Deletes a queue"
-    option("force") { cast :boolean; default false }
-    def run
-      Cliaws.sqs.delete(queue_name, params["force"].value)
-      puts "Queue #{queue_name} was deleted."
-    end
-  end
-
-  mode("list") do
-    description "Lists the available queues"
-    def run
-      puts Cliaws.sqs.list
-    end
-  end
-
-  mode("size") do
-    mixin :qname
-    description "Prints the queue's size."
-    def run
-      puts Cliaws.sqs.size(queue_name)
-    end
-  end
-
-  mode("receive") do
-    mixin :qname
-    description "Receive (but keep) a message from the named queue."
-    def run
-      puts Cliaws.sqs.receive(queue_name)
-    end
-  end
-
-  mode("pop") do
-    mixin :qname
-    description "Retrieve and delete a message from the named queue."
-    def run
-      puts Cliaws.sqs.pop(queue_name)
-    end
-  end
-
-  mode("push") do
-    mixin :qname
-    option("data") { optional; argument_required }
-    argument("data_file") { optional; argument_required }
-    description "Pushes (sends) data from --data, data_file or STDIN to the named queue."
-    def run
-      data = case
-             when params["data"].given?
-               params["data"].value
-             when params["data_file"].given?
-               File.read(params["data_file"].value)
-             else
-               STDIN.read
-             end
-      Cliaws.sqs.push(queue_name, data)
-      puts "Pushed #{data.size} bytes to queue #{queue_name}"
-    end
-  end
-
-  mode("info") do
-    mixin :qname
-    def run
-      info = Cliaws.sqs.info(queue_name)
-      puts "Visibility: #{info[:visibility_timeout]}"
-      puts "Number of messages: #{info[:size]}"
-    end
-  end
-
-  def queue_name
-    params["queue_name"].value
-  end
-}
+require "cliaws/cli/sqs"
+Cliaws::Cli::Sqs.start

data/cliaws.gemspec

@@ -1,40 +1,60 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{cliaws}
-  s.version = "1.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]
-  s.date = %q{2008-10-26}
+  s.date = %q{2009-07-07}
   s.description = %q{A command-line suite of tools to access Amazon Web Services, using the RightAws gems.}
-  s.email = ["francois@teksol.info"]
+  s.email = %q{francois@teksol.info}
   s.executables = ["clis3", "clisqs", "cliec2"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "vendor/right_http_connection-1.2.1/README.txt"]
-  s.files = [".gitignore", "History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/cliec2", "bin/clis3", "bin/clisqs", "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"]
+  s.extra_rdoc_files = [
+    "History.txt",
+     "License.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "License.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "bin/cliec2",
+     "bin/clis3",
+     "bin/clisdb",
+     "bin/clisqs",
+     "cliaws.gemspec",
+     "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"
+  ]
   s.has_rdoc = true
-  s.homepage = %q{http://cliaws.rubyforge.org}
-  s.rdoc_options = ["--main", "README.txt"]
+  s.homepage = %q{http://cliaws.rubyforge.org/}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{cliaws}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{A command-line suite of tools to access Amazon Web Services, using the RightAws gems.}
-  s.test_files = ["test/test_cliaws.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<main>, ["~> 2.8"])
-      s.add_runtime_dependency(%q<right_aws>, ["~> 1.8"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thor>, ["~> 0.9"])
+      s.add_runtime_dependency(%q<right_aws>, ["~> 1.10"])
     else
-      s.add_dependency(%q<main>, ["~> 2.8"])
-      s.add_dependency(%q<right_aws>, ["~> 1.8"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<thor>, ["~> 0.9"])
+      s.add_dependency(%q<right_aws>, ["~> 1.10"])
     end
   else
-    s.add_dependency(%q<main>, ["~> 2.8"])
-    s.add_dependency(%q<right_aws>, ["~> 1.8"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<thor>, ["~> 0.9"])
+    s.add_dependency(%q<right_aws>, ["~> 1.10"])
   end
 end

data/lib/cliaws/cli/ec2.rb

@@ -0,0 +1,97 @@
+require "thor"
+require "cliaws"
+
+module Cliaws
+	module Cli
+		class Ec2 < Thor
+			map ["-h", "--help"] => :help
+
+			map ["describe-instances"] => :list
+			desc "list", <<EOD
+Returns a list of all known EC2 instances
+EOD
+			method_options :yaml => :boolean
+			def list
+				instances = Cliaws.ec2.list
+				if options[:yaml] then
+					puts instances.map {|i| i.raw_data}.to_yaml
+				else
+					printf "%-10s %-50s %-12s %s\n", "ID", "DNS Name", "State", "Groups"
+					printf "-"*120
+					print "\n"
+					instances.each do |instance|
+						printf "%-10s %-50s %-12s %s\n", instance.instance_id, instance.public_dns_name, instance.state, instance.groups.join(", ")
+					end
+				end
+			end
+
+			map ["launch"] => :run
+			desc "run AMI", <<EOD
+Launches one or more instances.  Only one group may be specified at this time.
+EOD
+			method_options :count => 1, :type => "m1.small", :keypair => :required, :group => :optional
+			def run(ami)
+				instances = Cliaws.ec2.run(ami, :type => options[:type], :count => options[:count], :keypair => options[:keypair], :groups => options[:group])
+				result = {"Started" => instances.map {|i| i.instance_id}}
+				puts result.to_yaml
+			end
+
+			desc "terminate INSTANCE_ID [INSTANCE_ID...]", <<EOD
+Terminates all specified instances.
+EOD
+			def terminate(*instance_ids)
+				instances = Cliaws.ec2.terminate(instance_ids)
+				result = {"Terminating" => instances.map {|i| i.instance_id}}
+				puts result.to_yaml
+			end
+
+			map ["allocate-address"] => :allocate_address
+			desc "allocate-address", <<EOD
+Assigns an elastic IP with your account.
+EOD
+			def allocate_address
+				address = Cliaws.ec2.allocate_address
+				puts "Allocated: #{address}"
+			end
+
+			map ["deallocate-address"] => :deallocate_address
+			desc "deallocate-address ADDRESS", <<EOD
+Deallocates the given Elastic IP address from your account.
+EOD
+			def deallocate_address(address)
+				Cliaws.ec2.deallocate_address(address)
+				puts "Deallocated: #{address}"
+			end
+
+			map ["associate-address"] => :associate_address
+			method_options :address => :required, :instance => :required
+			desc "associate-address", <<EOD
+Associates an address to an instance.
+EOD
+			def associate_address
+				address  = options[:address]
+				instance = options[:instance]
+				Cliaws.ec2.associate_address(:address => address, :instance => instance)
+				puts "Associated:\n  #{instance}: #{address.inspect}"
+			end
+
+			map ["disassociate-address"] => :disassociate_address
+			desc "disassociate-address ADDRESS", <<EOD
+Disassociates an address from an instance.
+EOD
+			def disassociate_address(address)
+				address = options[:address]
+				Cliaws.ec2.disassociate_address(address)
+				puts "Disassociated: #{address}"
+			end
+
+			map ["describe-addresses"] => :describe_addresses
+			desc "describe-addresses", <<EOD
+Returns a YAML representation of all Elastic IP addresses associated with this account.
+EOD
+			def describe_addresses
+				puts Cliaws.ec2.describe_addresses.to_yaml
+			end
+		end
+	end
+end