s3itch_client 1.0.1 → 1.1.0

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in s3itch_cli.gemspec
 gemspec
+
+platforms :jruby do
+  gem "jruby-openssl"
+end

data/lib/s3itch_client.rb

@@ -14,22 +14,27 @@ module S3itchClient
       raise ArgumentError, "A URL must be provided"
     end
 
-    url = options[:url]
+    uri = URI.parse(options[:url])
     username = options[:username]
     password = options[:password]
 
     if File.exists?(filepath) && !File.directory?(filepath)
       uniq_name = build_unique_name(filepath)
 
-      uri = URI.parse "#{url}/#{uniq_name}"
+      uri.path = "/#{uniq_name}"
 
       http = Net::HTTP.new(uri.host, uri.port)
+
+      if uri.scheme == "https"
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
       request = Net::HTTP::Put.new(uri.request_uri)
 
       if username && password
         request.basic_auth(username, password)
       end
-
       request.content_type = "application/octet-stream"
       response = http.request(request, File.open(filepath).read)
 

data/lib/s3itch_client/version.rb

@@ -1,3 +1,3 @@
 module S3itchClient
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/s3itch_client_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "spec_helper"
 
 describe S3itchClient do
@@ -46,6 +47,10 @@ describe S3itchClient do
         :password => "secret"
       }
     end
+    let(:http_stub) do
+      stub = stub_request(:put, /s3itch.herokuapp.com/).
+        to_return(:body => "", :status => 201, :headers => { "Location" => "http://s3itch.example.com/kitten.jpeg" })
+    end
 
 
     it "raises an exception if no url is defined" do
@@ -57,10 +62,18 @@ describe S3itchClient do
     end
 
     it "sends files to s3itch" do
-      stub = stub_request(:put, /s3itch.herokuapp.com/).
-        to_return(:body => "", :status => 201, :headers => { "Location" => "http://s3itch.exmaple.com/kitten.jpeg" })
-      S3itchClient.upload(kitten_path, options).should == "http://s3itch.exmaple.com/kitten.jpeg"
-      stub.should have_been_requested
+      http_stub
+      S3itchClient.upload(kitten_path, options).should == "http://s3itch.example.com/kitten.jpeg"
+      http_stub.should have_been_requested
+    end
+
+    it "uses HTTPS if necessary" do
+      http_stub
+      https_options = options
+      https_options[:url] = "https://s3itch.herokuapp.com"
+      S3itchClient.upload(kitten_path, options).should == "http://s3itch.example.com/kitten.jpeg"
+      http_stub.should have_been_requested
+      WebMock.should have_requested(:put, /s3itch.herokuapp.com/).with { |req| req.uri.scheme == "https" }
     end
 
     it "raises an exception if the 'Location' header returned" do

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: s3itch_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
+  prerelease:
 platform: ruby
 authors:
 - Matias Korhonen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.11
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
+    none: false
+  prerelease: false
+  type: :development
 description: Send files to s3itch from the command line
 email:
 - me@matiaskorhonen.fi
@@ -104,7 +104,6 @@ files:
 - .travis.yml
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -118,35 +117,36 @@ files:
 - spec/support/kitten.jpeg
 homepage: https://github.com/k33l0r/s3itch_client
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3642218463313132411
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: '0'
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3642218463313132411
+      version: '0'
+      hash: 2
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Upload files to S3 via your own s3itch instance
 test_files:
 - spec/s3itch_client_spec.rb
 - spec/spec_helper.rb
 - spec/support/kitten.jpeg
+...

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    s3itch_client (1.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.2)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler
-  rake
-  rspec (~> 2.11.0)
-  s3itch_client!
-  simplecov (~> 0.6.4)
-  webmock (~> 1.8.11)