cliaws 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.2.2 2008-08-25
+
+* clis3 put was rewritten to work correctly with --data, stdin and multiple files.
+
 == 1.2.1 2008-05-30
 
 * clis3 put A bucket/ will put to bucket/A, while clis3 put A bucket/B will

data/bin/clis3

@@ -56,7 +56,7 @@ Main {
   end
 
   mode("put") do
-    argument("local_files") do
+    argument("files_or_s3_path") do
       optional
       argument_required
       arity -2
@@ -68,17 +68,17 @@ Main {
     end
 
     def run
-      source_name = nil
-      if params["local_files"].given? && params["data"].given? then
-        abort "Cannot give both the --data and local_files parameters at the same time"
-      elsif !params["local_files"].given? && !params["data"].given? then
+      paths = params["files_or_s3_path"].values
+      s3_object = paths.pop
+
+      if params["data"].given? && !paths.empty? then
+        raise ArgumentError, "Cannot specify both --data and filename(s) to send."
+      elsif params["data"].given? then
+        source = params["data"].value
+      elsif paths == ["-"] then
         source = STDIN
-      elsif params["local_files"].given? && params["local_files"].values.length == 2 then
-        source_name = params["local_files"].values.shift
-        source = File.open(source_name, "rb")
-      elsif params["local_files"].given? then
-        s3_object = params["local_files"].values.pop
-        targets = params["local_files"].values.map {|filename| filename.to_s}
+      else
+        targets = paths.map {|filename| filename.to_s}
         targets.each do |local_file|
           File.open(local_file, "rb") do |source|
             remote_file = File.join(s3_object, File.basename(local_file))
@@ -88,16 +88,9 @@ Main {
         end
 
         exit 0
-      else
-        source = params["data"].value
-      end
-
-      s3_object = params["local_files"].values.pop
-      if s3_object =~ /\/$/ then
-        raise ArgumentError, "Target is a directory, but input is not a local file -- cannot proceed" if source_name.nil?
-        s3_object = File.join(s3_object, File.basename(source_name))
       end
 
+      raise ArgumentError, "Target is a directory, but input is not a local file -- cannot proceed" if s3_object =~ /\/$/
       Cliaws.s3.put(source, s3_object)
 
     rescue Cliaws::S3::UnknownBucket

data/config/hoe.rb

@@ -59,9 +59,9 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = [
-    ["main", "~> 2.8.0"],
-    ["right_aws", "~> 1.7.1"],
-    ["activesupport", "~> 2.0.2"]
+    ["main", "~> 2.8"],
+    ["right_aws", "~> 1.8"],
+    ["activesupport", "~> 2.1"]
   ]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.

data/lib/cliaws/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,35 +9,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-30 00:00:00 -04:00
+date: 2008-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.8.0
+        version: "2.8"
     version: 
 - !ruby/object:Gem::Dependency 
   name: right_aws
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.7.1
+        version: "1.8"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: "2.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: A command-line suite of tools to access Amazon Web Services, using the RightAws gems.
 email: 
@@ -107,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cliaws
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A command-line suite of tools to access Amazon Web Services, using the RightAws gems.