swift_file 0.0.2 → 0.0.3

data/README.md

@@ -1,10 +1,14 @@
 # SwiftFile
 
-TODO: Write a gem description
+This gem provides an interface for uploading files to the [SwiftFile](https://www.swiftfile.net) service. There is support for uploading via the command line via the supplied executable `swift_file` as well as a basic API for adding support to your own classes.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Most likely you will want to simply install the gem:
+
+    $ gem install swift_file
+
+Or to use this in your projects, add this line to your application's Gemfile:
 
     gem 'swift_file'
 
@@ -12,13 +16,13 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install swift_file
-
-## Usage
+## Command-line Usage
+`swift_file -h`
 
-TODO: Write usage instructions here
+    Usage: swift_file [options] file1 file2 ...
+        -g, --group GROUP                Add this file to a group
+        -e, --expires EXPIRY             Set the length of time until this file expires [1m 1w 1d 1h]
+        -p[PASSWORD]                     Supply a password to encrypt the file.
 
 ## Contributing
 

data/bin/swift_file

@@ -1,38 +1,57 @@
 #!/usr/bin/env ruby
 require "optparse"
+require "highline/import"
 require "swift_file"
-require "pp"
 
 options = {}
 
 optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: swift_file [options] file"
+  opts.banner = "Usage: swift_file [options] file1 file2 ..."
 
   options[:group] = nil
   opts.on( '-g', '--group GROUP', 'Add this file to a group' ) do |group|
     options[:group] = group
   end
 
+  options[:expiry] = nil
+  opts.on( '-e', '--expires EXPIRY', "Set the length of time until this file expires [#{SwiftFile::SwiftUpload::SWIFTFILE_EXPIRY_OPTIONS.join(' ')}]" ) do |expiry|
+    options[:expiry] = expiry
+  end
+
   options[:password] = nil
-  opts.on( '-p', '--password PASS', 'Secure the file with a password' ) do |pass|
-    options[:password] = pass
+  opts.on( '-p[PASSWORD]', 'Supply a password to encrypt the file.' ) do |password|
+    options[:password] = password
   end
 end
 
-optparse.parse!
+# Check if user has (correctly) supplied the -p flag without the password
+password_opt_supplied = ARGV.include?('-p')
+
+begin
+  optparse.parse!
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+  puts "ERROR: #{e}"
+end
+
+if options[:password] == nil && password_opt_supplied
+  # FIXME: highline is not behaving on my installation, and
+  #   disabling echo causes an infinte loop of errors
+  options[:password] = ask("Enter a password: ") # { |q| q.echo = false }
+end
 
 begin
+  if ARGV.empty?
+    raise "no files supplied"
+  end
 
-  f = File.new(ARGV[0])
+  sf = SwiftFile::SwiftUpload.new(options)
 
-  sf = SwiftFile::SwiftUpload.new({
-    :file => f,
-    :group => options[:group],
-    :password => options[:password]
-  })
+  ARGV.each do |filepath|
+    sf.add_file File.new(filepath)
+  end
 
-  sf.upload
+  sf.transfer
   puts sf.url
-rescue Exception => e
+rescue => e
   puts "ERROR: #{e}"
 end

data/lib/swift_file.rb

@@ -2,7 +2,6 @@ require "swift_file/version"
 require "swift_file/swift_upload"
 
 module SwiftFile
-
   class << self
     attr_accessor :swift_file, :swift_file_group, :swift_file_password
 

data/lib/swift_file/swift_upload.rb

@@ -2,56 +2,83 @@ require 'curb'
 
 module SwiftFile
   class SwiftUpload
-    @@swiftfile_host      = "https://www.swiftfile.net"
-    @@swiftfile_endpoint  = ""
-    @@swiftfile_cookie    = "/tmp/swift_file.cookie"
+    SWIFTFILE_HOST              = 'https://www.swiftfile.net'
+    SWIFTFILE_ENDPOINT          = ''
+    SWIFTFILE_COOKIE            = '/tmp/swift_file.cookie'
+    SWIFTFILE_EXPIRY_OPTIONS    =  %w(1m 1w 1d 1h)
+    SWIFTFILE_EXPIRY_DEFAULT    = '1d'
 
-    attr_accessor :file, :group, :url
+    attr_accessor :files, :group, :expiry, :url
 
     def initialize(params)
-      if File.readable?(params[:file]) && File.file?(params[:file])
-        @file = params[:file]
+      @files    = params[:files] || []
+      @group    = params[:group] || ''
+      @password = params[:password] || ''
+
+      if params[:expiry] && SWIFTFILE_EXPIRY_OPTIONS.include?(params[:expiry])
+        @expiry = params[:expiry]
       else
-        raise ArgumentError.new('Invalid file supplied for upload')
+        @expiry = SWIFTFILE_EXPIRY_DEFAULT
       end
+    end
 
-      @group = params[:group] || ''
-      @password = params[:password] || ''
+    def add_file(file)
+      @files << file unless @files.include?(file)
     end
 
+    def transfer
+      if @files.empty?
+        raise 'No files supplied for uploed'
+      end
+
+      # start a session by requesting the url via GET
+      begin
+        client.perform
+      rescue Curl::Err => e
+        raise "Connection failed: #{e}"
+      end
 
-    def upload
-      # start a session by requestion the url via GET
-      client.perform
+      # post the file and capture the resulting url
+      begin
+        client.multipart_form_post = true
+        client.http_post(form)
 
-      # now post
-      client.multipart_form_post = true
-      client.http_post(
-        Curl::PostField.file('file1', "#{@file.path}"),
-        Curl::PostField.content('file_group[name]', @group),
-        Curl::PostField.content('file_group[password]', @password),
-        Curl::PostField.content('file_group_expiration', '1m')
-      )
+        @url = client.last_effective_url
+      rescue Curl::Err => e
+        raise "Upload failed: #{e}"
+      ensure
+        client.close
+      end
 
-      @url = client.last_effective_url
       @url
     end
 
-    ##
-    private
 
+    private
     def client
       if !@client
-        url = "#{@@swiftfile_host}/#{@@swiftfile_endpoint}"
+        url = "#{SWIFTFILE_HOST}/#{SWIFTFILE_ENDPOINT}"
         @client = Curl::Easy.new(url) do |curl|
-            # curl.verbose= true
-            curl.follow_location = true
-            curl.enable_cookies = true
-            curl.cookiejar = @@swiftfile_cookie
+          # curl.verbose= true
+          curl.follow_location = true
+          curl.enable_cookies = true
+          curl.cookiejar = SWIFTFILE_COOKIE
+          curl.cookiefile = SWIFTFILE_COOKIE
         end
       end
-
       @client
     end
+
+    def form
+      fields = []
+      @files.each_with_index do |file, idx|
+        fields << Curl::PostField.file("file#{idx+1}", "#{file.path}")
+      end
+
+      fields << Curl::PostField.content('file_group[name]', @group)
+      fields << Curl::PostField.content('file_group[password]', @password)
+      fields << Curl::PostField.content('file_group_expiration', @expiry)
+      fields
+    end
   end
 end

data/lib/swift_file/version.rb

@@ -1,3 +1,3 @@
 module SwiftFile
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/swift_file_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-describe SwiftUpload do
+describe SwiftFile do
   it "should be able to upload test file" do
     f = File.new(File.dirname(__FILE__) + '/test_file.txt', 'rb')
-    sf = SwiftFile::SwiftUpload.new({:file => f})
+    files = Array[f]
+    sf = SwiftFile::SwiftUpload.new({:files => files})
 
-    sf.upload
+    sf.transfer
     sf.url.should =~ /^https/
   end
 end

data/swift_file.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rspec"
-  gem.add_dependency("curb", ">= 0.8.1")
+  gem.add_dependency("highline", '>=1.6')
+  gem.add_dependency("curb")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift_file
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0'
 description: Upload a file to the SwiftFile service
 email:
 - mdeltito@contextllc.com