skadategems-dev 0.0.9 → 0.0.10.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e33edde9f192e2f7ae332814071a43999948b7
-  data.tar.gz: c2649b9b7712b0101d723bab3652a9a6616d8e9d
+  metadata.gz: 1aeda06d748372294c896e96dac819b45a785676
+  data.tar.gz: 755076e850ec95f9653a6954b1111d53fa5e2e51
 SHA512:
-  metadata.gz: d856f40cc708bf6df51218e1f3aae1fda23e79e0ae09874b43a1ed1397e1116edeaf31c04f104fed8d62cb21a08cdb164e0541a76803b610666712e6e86ec413
-  data.tar.gz: 904a9029cf3b8039176b14811b9af3af05593d44da7c61483dc069cf09500564de3d6c0fb777e61f85edd0b9a48e33cb2239f4cec628ca9dd57f66681ef19da0
+  metadata.gz: 98b610822efb0b424d3b76da25055c5b9dab776790dc2fb30fc35084022747cf3511c1ca2fc84a82ee23b04c5bb1659b592d69ef481035af10e9b663e2e4516a
+  data.tar.gz: 68eefbb78dda9550e132defb86978b2018ce591b7b93aae8aab99ab7415f8acf6106d54e60783fb2d4f4af93670f7f96229e40c646b83a1a62f162ce0a476080

data/integration/lib/remote/download_file_spec.rb

@@ -68,6 +68,27 @@ module SkadateGems::Dev
           end
         end
 
+        context 'when a system call error occurred' do
+
+          it 'retries the request' do
+            counter = 0
+
+            remote_file.request do |_|
+              case (counter += 1)
+                when 1
+                  raise Errno::ECONNRESET
+                when 2
+                  raise EOFError
+                else
+                  # ...
+              end
+            end
+
+            expect(counter).to be >= 3
+          end
+
+        end
+
       end
 
     end

data/integration/spec_helper.rb

@@ -6,11 +6,17 @@ require 'fileutils'
 
 RSpec.configure do |config|
 
+  config.before(:all) do
+    [skadate_tmp_dir, skadate_local_dir, skadate_remote_dir].each do |dir|
+      FileUtils.mkdir(dir, verbose: verbose?) unless File.exists?(dir)
+    end
+  end
+
   config.before(:each) do
     # cleanup sandbox directories
-    [skadate_local_dir, skadate_remote_dir].each do |entry|
-      if entry.is_a?(String) && (entry['tmp'] || entry['temp']) && entry['skadate']
-        FileUtils.rm_r Dir.glob("#{entry}/{*,.dev,.ht*}"), :verbose => verbose?
+    [skadate_local_dir, skadate_remote_dir].each do |dir|
+      if dir.is_a?(String) && (dir['tmp'] || dir['temp']) && dir['skadate']
+        FileUtils.rm_r Dir.glob("#{dir}/{*,.dev,.ht*}"), :verbose => verbose?
       else
         raise <<-ERRORMSG
 Error: bad tmp dir entry "#{path}".

data/lib/skadategems/dev/cli/remote.rb

@@ -185,7 +185,7 @@ If you want to get another theme specify it using the `--layout-theme` switch as
         /m/application/cache/smarty_compile
       ]
 
-      IGNORED_FILE_EXTENSIONS = %w[.tar .bz2 .gz .zip .rar .iso]
+      IGNORED_FILE_EXTENSIONS = %w[.tar .bz2 .gz .tgz .zip .rar .iso]
 
       # default values, rewritable by ENV['SKADATE_MAX_*_FILE_SIZE']
       MAX_SOURCE_FILE_SIZE = 1024 * 1024 * 2 # ~2 megabytes
@@ -211,9 +211,9 @@ Remote clone options `--schema`, `--configs` are currently not implemented, plea
         layout_theme = options[:layout_theme]
         @max_file_size = MAX_SOURCE_FILE_SIZE
 
-        dev_logs_dir = ::File.join(current.root_dir, '.dev', 'log')
-        FileUtils.mkdir_p(dev_logs_dir) unless ::File.exists?(dev_logs_dir)
-        log_filename = ::File.join(dev_logs_dir, "remote-clone[#{Time.now.to_i}].log")
+        dev_logs_dir = File.join(current.root_dir, '.dev', 'log')
+        FileUtils.mkdir_p(dev_logs_dir) unless File.exists?(dev_logs_dir)
+        log_filename = File.join(dev_logs_dir, "remote-clone[#{Time.now.to_i}].log")
 
         logger.start(log_filename) do |log|
           if options[:sources]

data/lib/skadategems/dev/remote/file.rb

@@ -47,7 +47,7 @@ module SkadateGems
 
         # Request remote file to read it's contents.
         # @yield [response] passes a http response to the block
-        def request(md5_checksum: nil, &block)
+        def request(md5_checksum: nil, retries: 3, &block)
           path = self.path.dup
           path[0] = '' if path[0] == '/'
 
@@ -87,19 +87,24 @@ readfile($filename);
 exit;
           PHPSCRIPT
 
-          @remote.accessor.exec(batch) do |response|
-            if response.is_a?(Net::HTTPNotModified)
-              block.call(response)
-            elsif response.is_a?(Net::HTTPOK)
-              if response['content-disposition'] == "attachment; filename=#{basename}" &&
-                  response['x-content-md5-checksum']
+          begin
+            @remote.accessor.exec(batch) do |response|
+              if response.is_a?(Net::HTTPNotModified)
                 block.call(response)
+              elsif response.is_a?(Net::HTTPOK)
+                if response['content-disposition'] == "attachment; filename=#{basename}" &&
+                    response['x-content-md5-checksum']
+                  block.call(response)
+                else
+                  raise 'unexpected response headers'
+                end
               else
-                raise 'unexpected response headers'
+                raise "[#{response.code} \"#{response.message}\"]"
               end
-            else
-              raise "[#{response.code} \"#{response.message}\"]"
             end
+          rescue SystemCallError, EOFError
+            retry if (retries -= 1) >= 1
+            raise
           end
         end
 

data/lib/skadategems/dev/version.rb

@@ -1,5 +1,5 @@
 module SkadateGems
   module Dev
-    VERSION = '0.0.9'
+    VERSION = '0.0.10.rc1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skadategems-dev
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10.rc1
 platform: ruby
 authors:
 - Dan Kerimdzhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -130,12 +130,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Skadate Development Toolkit