shipt 0.0.6 → 0.1.2

data/Gemfile

@@ -5,6 +5,6 @@ gem 'trollop'
 
 group :test do
   gem 'autotest'
-  gem 'rspec', '~> 2.0.0.beta.22'
+  gem 'rspec', '~> 2.0.0.beta.18'
   gem 'yard'
 end

data/Gemfile.lock

@@ -4,8 +4,8 @@ GEM
     autotest (4.3.2)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    excon (0.2.2)
-    fog (0.2.30)
+    excon (0.2.0)
+    fog (0.2.22)
       builder
       excon (>= 0.2.0)
       formatador (>= 0.0.15)
@@ -15,23 +15,21 @@ GEM
       nokogiri (>= 1.4.3.1)
       ruby-hmac
     formatador (0.0.15)
-    json (1.4.6)
+    json (1.4.4)
     mime-types (1.16)
     net-ssh (2.0.23)
     nokogiri (1.4.3.1)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec-mocks (2.0.0.beta.19)
     ruby-hmac (0.4.0)
     trollop (1.16.2)
-    yard (0.6.1)
+    yard (0.5.8)
 
 PLATFORMS
   ruby
@@ -39,6 +37,6 @@ PLATFORMS
 DEPENDENCIES
   autotest
   fog
-  rspec (~> 2.0.0.beta.22)
+  rspec (~> 2.0.0.beta.18)
   trollop
   yard

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "justin.smestad@gmail.com"
     gem.homepage = "http://github.com/jsmestad/shipt"
     gem.authors = ["Justin Smestad"]
-    gem.add_dependency "fog", '~> 0.2.30'
+    gem.add_dependency "fog", '~> 0.2.22'
     gem.add_dependency "trollop", '~> 1.16.2'
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.22"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.2

data/bin/shipt

@@ -16,11 +16,11 @@ opts = Trollop::options do
 EOS
 
   opt :namespace,   "Namespace for buckets",              :type => :string,   :default => ENV['AWS_BUCKET_NAMESPACE']
-  opt :description, "Additional descriptor tag",          :type => :string,   :default => nil
   opt :bucket,      "Bucket name, should be server name", :type => :string,   :default => ENV['AWS_BUCKET_NAME']
+  opt :descriptor,  "Additional description",             :type => :string,   :default => ''
   opt :access_key,  "Amazon Access Key",                  :type => :string,   :default => ENV['AWS_ACCESS_KEY']
   opt :secret_key,  "Amazon Secret Access Key",           :type => :string,   :default => ENV['AWS_SECRET_KEY']
-  opt :cleanup,     "Cleanup the file after completion?", :default => false,  :default => ENV['SHIPT_CLEANUP']
+  opt :cleanup,     "Cleanup the file after completion?", :type => :boolean,  :default => false
 end
 
 s = Shipt.new(opts[:bucket], opts)

data/lib/shipt.rb

@@ -1,14 +1,14 @@
 require 'fog'
 require 'logger'
+require 'time'
 
 class Shipt
 
   def initialize(bucket_key, options={})
     raise RuntimeError unless options[:access_key] && options[:secret_key]
 
-    @server_name = bucket_key
-    @bucket_key = "#{options[:namespace]}-#{bucket_key}"
-    @description = options[:description]
+    @name = [bucket_key, options[:descriptor]].join('-')
+    @bucket_key = [options[:namespace], bucket_key].join('-')
     @access_key = options[:access_key]
     @secret_key = options[:secret_key]
     @logger     = Logger.new(options[:logger] || STDOUT)
@@ -16,10 +16,13 @@ class Shipt
 
   def upload_file(path)
     ext = File.extname(path)
+
+    timestamp = File.basename(path) =~ /\.log\.([\d-]*T[\d-]+)\./ ? $1 : Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S%Z")
+
     key_name =  if ext == '.log'
-                  "#{@server_name}-#{@description}-#{Time.now.strftime("%Y%m%d-%H%M%S")}#{ext}"
+                  "#{@name}-#{timestamp}#{ext}"
                 else
-                  "#{@server_name}-#{@description}-#{Time.now.strftime("%Y%m%d-%H%M%S")}.log#{ext}"
+                  "#{@name}-#{timestamp}.log#{ext}"
                 end
 
     @logger.info "Uploading \"#{path}\" => \"#{key_name}\""

data/shipt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shipt}
-  s.version = "0.0.6"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad"]
-  s.date = %q{2010-09-18}
+  s.date = %q{2011-02-21}
   s.default_executable = %q{shipt}
   s.description = %q{longer description of your gem}
   s.email = %q{justin.smestad@gmail.com}
@@ -52,20 +52,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fog>, ["~> 0.2.30"])
+      s.add_runtime_dependency(%q<fog>, ["~> 0.2.22"])
       s.add_runtime_dependency(%q<trollop>, ["~> 1.16.2"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<fog>, ["~> 0.2.30"])
+      s.add_dependency(%q<fog>, ["~> 0.2.22"])
       s.add_dependency(%q<trollop>, ["~> 1.16.2"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fog>, ["~> 0.2.30"])
+    s.add_dependency(%q<fog>, ["~> 0.2.22"])
     s.add_dependency(%q<trollop>, ["~> 1.16.2"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: shipt
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 6
-  version: 0.0.6
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Justin Smestad
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 -06:00
+date: 2011-02-21 00:00:00 -07:00
 default_executable: shipt
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 2
-        - 30
-        version: 0.2.30
+        - 22
+        version: 0.2.22
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
         segments: 
         - 1
         - 16
@@ -58,14 +55,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196431
         segments: 
+        - 1
         - 2
-        - 0
-        - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - 9
+        version: 1.2.9
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -123,7 +116,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -132,7 +124,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"