dpl 1.8.27.travis.1783.3 → 1.8.27.travis.1786.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc42f942debec5ab7b661e262d76162284e39046
-  data.tar.gz: fb11041ce5edeb642b4c97be625f1ee6f2b6f17d
+  metadata.gz: c7a47f6fcea353607970d7aad2db288fcd509860
+  data.tar.gz: f63bcfc27a43943b9e290be1c0caf9e298f7bca8
 SHA512:
-  metadata.gz: 8477792803e77a367358cd37ffe3b05c963b586fad57ec698a118a42a1d32a777677ef11ac56b18d3fee6ce4264670507cdaa96b79c9d439911d689022431f6c
-  data.tar.gz: b201e03d19bcc5b0c75158d68d92a60bdbfab954bde41d44d8b11d540104f6a9f468f4051bb21a346f7ab359e9e37f502d3bdf1f776373b624d1b80470f41b5e
+  metadata.gz: cded712882d9abc43e7ae4f25bc35dac6d20da2c1b22e719834f2ca60c8a449a9ea911cbd84bccef7e3555178ea214c852b0f8fc16f76b29fd1265edfc5b19f1
+  data.tar.gz: f0ddce52012c98c854ba38ce4515cc6e478ae74d36c0f2190cd2757468a43fe08a1f97817b4f855012cf2748679d8d5f22a399ee06a131070820684bd992da7c

data/lib/dpl/provider/packagecloud.rb

@@ -46,13 +46,15 @@ module DPL
 
       def dist_required?(filename)
         ext = File.extname(filename).gsub!('.','')
-        ["rpm", "deb", "dsc"].include?(ext)
+        if ext.nil?
+          error "filename: #{filename} has no extension!"
+        end
+        ["rpm", "deb", "dsc", "whl", "egg", "egg-info", "gz", "zip", "tar", "bz2", "z"].include?(ext.downcase)
       end
 
       def error_if_dist_required(filename)
-        ext = File.extname(filename).gsub!('.','')
-        if dist_required?(ext) && @dist.nil?
-          error "Distribution needed for rpm, deb, and dsc packages, example --dist='ubuntu/breezy'"
+        if dist_required?(filename) && @dist.nil?
+          error "Distribution needed for rpm, deb, python, and dsc packages, example --dist='ubuntu/breezy'"
         end
       end
 
@@ -92,16 +94,12 @@ module DPL
           Dir.glob(*glob_args) do |filename|
             unless File.directory?(filename)
               if is_supported_package?(filename)
-                error_if_dist_required(filename)
                 log "Detected supported package: #{filename}"
-                if dist_required?(filename)
-                  if is_source_package?(filename)
-                    log "Processing source package: #{filename}"
-                    source_files = get_source_files_for(filename)
-                    packages << ::Packagecloud::Package.new(:file => filename, :source_files => source_files)
-                  else
-                    packages << ::Packagecloud::Package.new(:file => filename)
-                  end
+                error_if_dist_required(filename)
+                if is_source_package?(filename)
+                  log "Processing source package: #{filename}"
+                  source_files = get_source_files_for(filename)
+                  packages << ::Packagecloud::Package.new(:file => filename, :source_files => source_files)
                 else
                   packages << ::Packagecloud::Package.new(:file => filename)
                 end
@@ -111,7 +109,13 @@ module DPL
         end
 
         packages.each do |package|
-          result = @client.put_package(@repo, package, get_distro(@dist))
+          log "Pushing package: #{package.filename}"
+          if dist_required?(package.filename)
+            result = @client.put_package(@repo, package, get_distro(@dist))
+          else
+            result = @client.put_package(@repo, package)
+          end
+
           if result.succeeded
             log "Successfully pushed #{package.filename} to #{@username}/#{@repo}"
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.27.travis.1783.3
+  version: 1.8.27.travis.1786.3
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec