fjords-client 0.0.6 → 1.0.1

data/lib/fjords-client/fjords-client.rb

@@ -4,9 +4,10 @@ require 'addressable/uri'
 require 'tmpdir'
 require 'digest/md5'
 require 'pathname'
+require "rbconfig"
 
 require "stripe"
-Stripe.api_key = 'pk_vfcVMdOHZGAFgqLGSEtlSKzsXeBYI'
+Stripe.api_key = 'pk_NYJZbk2hGD8kHCGHLx15EHD5w7HPO'
 
 module Fjords
   class Token
@@ -35,6 +36,14 @@ module Fjords
       def host=(host)
         @_host = host
       end
+
+      def ruby_zip?
+        @_ruby_zip ||= false
+      end
+
+      def ruby_zip=(ruby_zip)
+        @_ruby_zip = ruby_zip
+      end
     end
 
     # Delegate methods
@@ -81,6 +90,8 @@ module Fjords
     class Conflict < ClientError; end
     class UploadTooLarge < ClientError; end
     class NothingToUpload < ClientError; end
+    class TooManyConnections < ClientError; end
+    class PreconditionFailed < ClientError; end
 
     attr_reader :username
 
@@ -261,8 +272,21 @@ module Fjords
 
       zip_excludes = excludes.map { |e| "-x \"#{e}\"" }.join(' ')
 
-      Dir.chdir(path) do
-        puts `zip -y -q -r #{zipfile} . #{zip_excludes}`
+      if self.class.ruby_zip?
+        require 'zip/zipfilesystem'
+
+        ::Zip::ZipFile::open(zipfile, true) do |zf|
+          get_file_paths(dir).each do |f|
+            zf.add(f.sub("#{path}/",''), f)
+          end
+        end
+      else
+        to_null = !!(RbConfig::CONFIG['host_os'] =~ /mingw|mswin32|cygwin/) ? 'nul' : '/dev/null'
+
+        Dir.chdir(path) do
+          `zip -y -q -r #{zipfile} . #{zip_excludes} 2> #{to_null}`
+          # return unless $? != 0
+        end
       end
 
       [zipfile, changeless]
@@ -336,6 +360,12 @@ module Fjords
         raise Conflict.new(e)
       rescue RestClient::Forbidden => e
         raise Forbidden.new(e)
+      rescue RestClient::TooManyConnectionsFromThisIP => e
+        raise TooManyConnections.new(e)
+      rescue RestClient::PreconditionFailed => e
+        # Bad token
+        remove_token if token
+        raise PreconditionFailed.new(e)
       rescue Errno::ECONNREFUSED => e
         raise ConnectionRefused.new(e)
       rescue Exception => e

data/lib/fjords-client/version.rb

@@ -1,5 +1,5 @@
 module Fjords
   class Client
-    VERSION = "0.0.6"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fjords-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1471701448195210841
+      hash: 3275000126563766821
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1471701448195210841
+      hash: 3275000126563766821
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23