cliaws 1.7.4 → 1.7.6

data/Rakefile

@@ -11,7 +11,7 @@ begin
     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.10"
+    gemspec.add_dependency "thor", "> 0.11", "< 0.12"
     gemspec.add_dependency "right_aws", "~> 1.10"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.7.4
+1.7.6

data/cliaws.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cliaws}
-  s.version = "1.7.4"
+  s.version = "1.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]
@@ -46,14 +46,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, ["< 0.10"])
+      s.add_runtime_dependency(%q<thor>, ["> 0.11", "< 0.12"])
       s.add_runtime_dependency(%q<right_aws>, ["~> 1.10"])
     else
-      s.add_dependency(%q<thor>, ["< 0.10"])
+      s.add_dependency(%q<thor>, ["> 0.11", "< 0.12"])
       s.add_dependency(%q<right_aws>, ["~> 1.10"])
     end
   else
-    s.add_dependency(%q<thor>, ["< 0.10"])
+    s.add_dependency(%q<thor>, ["> 0.11", "< 0.12"])
     s.add_dependency(%q<right_aws>, ["~> 1.10"])
   end
 end

data/lib/cliaws/cli/s3.rb

@@ -2,9 +2,9 @@ require "thor"
 require "cliaws"
 
 module Cliaws
-	module Cli
-		class S3 < Thor
-			map ["-h", "--help"] => :help
+  module Cli
+    class S3 < Thor
+      map ["-h", "--help"] => :help
 
       desc "buckets", <<EOD
 Returns a list of bucket names.
@@ -32,16 +32,16 @@ EOD
         bucket.delete(options[:force])
       end
 
-			desc "url S3_OBJECT_PATH", <<EOD
+      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
+      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
+      desc "list [S3_OBJECT_PATH_PREFIX]", <<EOD
 Lists all S3 objects that start with the given string.
 
 EXAMPLES
@@ -61,24 +61,24 @@ 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
+      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
+      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
+      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
+      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).
@@ -91,108 +91,108 @@ $ clis3 put photos/peter.jpg photos/sarah.jpg vacation/2009/photos/hosts
 $ clis3 put movies vacation/2009/movies
 EOD
       method_options :data => :string
-			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
+      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
+      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
+      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
+      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
 
       desc "grants BUCKET|KEY", <<EOD
 Returns a YAML representation of grants assigned to a bucket or key.
@@ -249,6 +249,6 @@ EOD
         Cliaws.s3.grant(thing, who => permissions.map {|perm| perm.gsub('_', '-')})
         grants(thing)
       end
-		end
-	end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.7.4
+  version: 1.7.6
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -18,9 +18,12 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "0.11"
     - - <
       - !ruby/object:Gem::Version 
-        version: "0.10"
+        version: "0.12"
     version: 
 - !ruby/object:Gem::Dependency 
   name: right_aws