dpl 1.5.9.travis.394.1 → 1.5.9.travis.397.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTBmZTUzNDVmYmEyYjA3ZWQ2NzhmODg2NDg5MzdhY2Q1ZTdjY2M4Ng==
+    MDc5NTZmYjA5ODkxOGM5YzlhNjQzYjZmZmRmYzBjNWJmY2FlZTYxMg==
   data.tar.gz: !binary |-
-    YjJiMzljNTU5YzhjODdkZGVjNDFiYjE0OTUwNTYwNWUxMGRmNGQ3YQ==
+    MDQzYjA1ZmU2NzZmYWVmY2RiYzFhOTFjMmIxNDlhMzZkNjI4MzhiMA==
 SHA512:
   metadata.gz: !binary |-
-    YTJjODU5MzE4NDljYjBkNDI4YjQzMjc1NGFhYzEwYWZkY2U3N2E4NmJiNWIx
-    ODdlNWUwZGQ4YTZhNWFlOTM0OTliOWQzNjQ1ZjE4MzM2OTZhMGI0OTQwMmMz
-    ZWUyZDdhNDRiMGRiYjE2MjQzMTg4ZTE5ODY4MDI5ZThmYjVkYzM=
+    ODNkYTJmYTVjNWQ0OWVkMDg1MTBjOGU2MmMxZTg3MGFlNDQ1NTRlYTBlNmFi
+    NzZiOThlOWNkNzJhYjQxN2U3MDUyYTJiYjE3OTU1MDllZjI3MDUzZTdjNTAw
+    MThiY2Q3OGM0N2U2NmZmZjY5Y2U0NDhmM2VmYjgwNzhmZmUwNzQ=
   data.tar.gz: !binary |-
-    MTM2NjY3ZWI3ZDQ4NzNjYTQ0ODM1MWEyMmIwZTNhNjE0ZWUxOTJkNzAyNGVk
-    NTNhNWI2ZTkwYTVmMDU2NmM5MTYwN2Q2YmYzZTVmOGE5ZDg3ZjVjM2JmNjVk
-    OWVmMWRmMTNiY2U3YzgyZjVjODkzYzBlNTI2OWE5ZmNjODM2ZTA=
+    ZDhjODhjYThlZDY0MTQzMzZhYTU3ZWNmMTZkM2FjZjc5MDk3Y2QzYTYwZTUw
+    YTAzYTYxNDllMWE3NzE1YTY2NGRlNDViNzUyOWU3ZjRjNWZjZTZmYTZjZmYx
+    ZDA0N2JjZDIzNDliNmY3ZjUyZTZlMDRhNzgxZDdhYWYwODhlNTY=

data/lib/dpl/provider/releases.rb

@@ -45,6 +45,11 @@ module DPL
 
       def check_auth
         setup_auth
+
+        unless api.scopes.include? 'public_repo' or api.scopes.include? 'repo'
+          raise Error, "Dpl does not have permission to upload assets. Make sure your token contains the repo or public_repo scope."
+        end
+        
         log "Logged in as #{user.name}"
       end
 
@@ -65,7 +70,18 @@ module DPL
         end
 
         Array(options[:file]).each do |file|
-          api.upload_asset(release_url, Pathname.new(file).basename.to_s, {:content_type => MIME::Types.type_for(file).first.to_s})
+          already_exists = false
+          filename = Pathname.new(file).basename.to_s
+          api.release(release_url).rels[:assets].get.data.each do |existing_file|
+            if existing_file.name == filename
+              already_exists = true
+            end
+          end
+          if already_exists
+            log "#{filename} already exists, skipping."
+          else
+            api.upload_asset(release_url, filename, {:content_type => MIME::Types.type_for(file).first.to_s})
+          end
         end
       end
     end

data/spec/provider/releases_spec.rb

@@ -47,18 +47,27 @@ describe DPL::Provider::Releases do
   end
 
   describe :check_auth do
-    example do
+    example "With proper permissions" do
       allow_message_expectations_on_nil
       provider.stub(:user)
       provider.stub(:setup_auth)
+      provider.api.should_receive(:scopes).and_return(["public_repo"])
       provider.user.should_receive(:name).and_return("foo")
       provider.should_receive(:log).with("Logged in as foo")
       provider.check_auth
     end
+
+    example "With improper permissions" do
+      allow_message_expectations_on_nil
+      provider.stub(:user)
+      provider.stub(:setup_auth)
+      provider.api.should_receive(:scopes).exactly(2).times.and_return([])
+      expect { provider.check_auth }.to raise_error(DPL::Error)
+    end
   end
 
   describe :push_app do
-    example "When Release Exists" do
+    example "When Release Exists but has no Files" do
       allow_message_expectations_on_nil
 
       provider.options.update(:file => ["test/foo.bar", "bar.foo"])
@@ -67,17 +76,47 @@ describe DPL::Provider::Releases do
       provider.stub(:get_tag).and_return("v0.0.0")
 
       provider.releases.map do |release| 
-      	release.stub(:tag_name).and_return("v0.0.0")
-      	release.stub(:rels).and_return({:self => nil})
-      	release.rels[:self].stub(:href)
+        release.stub(:tag_name).and_return("v0.0.0")
+        release.stub(:rels).and_return({:self => nil})
+        release.rels[:self].stub(:href)
       end
 
+      provider.api.stub(:release)
+      provider.api.release.stub(:rels).and_return({:assets => nil})
+      provider.api.release.rels[:assets].stub(:get).and_return({:data => [""]})
+      provider.api.release.rels[:assets].get.stub(:data).and_return([])
+
       provider.api.should_receive(:upload_asset).with(anything, "foo.bar", anything)
       provider.api.should_receive(:upload_asset).with(anything, "bar.foo", anything)
 
       provider.push_app
     end
 
+    example "When Release Exists and has Files" do
+      allow_message_expectations_on_nil
+
+      provider.options.update(:file => ["test/foo.bar", "bar.foo"])
+
+      provider.stub(:releases).and_return([""])
+      provider.stub(:get_tag).and_return("v0.0.0")
+
+      provider.releases.map do |release| 
+        release.stub(:tag_name).and_return("v0.0.0")
+        release.stub(:rels).and_return({:self => nil})
+        release.rels[:self].stub(:href)
+      end
+
+      provider.api.stub(:release)
+      provider.api.release.stub(:rels).and_return({:assets => nil})
+      provider.api.release.rels[:assets].stub(:get).and_return({:data => [""]})
+      provider.api.release.rels[:assets].get.stub(:data).and_return([double(:name => "foo.bar"), double(:name => "foo.foo")])
+
+      provider.api.should_receive(:upload_asset).with(anything, "bar.foo", anything)
+      provider.should_receive(:log).with("foo.bar already exists, skipping.")
+
+      provider.push_app
+    end
+
     example "When Release Doesn't Exist" do
       allow_message_expectations_on_nil
 
@@ -95,6 +134,11 @@ describe DPL::Provider::Releases do
       provider.api.create_release.stub(:rels).and_return({:self => nil})
       provider.api.create_release.rels[:slef].stub(:href)
 
+      provider.api.stub(:release)
+      provider.api.release.stub(:rels).and_return({:assets => nil})
+      provider.api.release.rels[:assets].stub(:get).and_return({:data => nil})
+      provider.api.release.rels[:assets].get.stub(:data).and_return([])
+
       provider.api.should_receive(:upload_asset).with(anything, "foo.bar", anything)
       provider.api.should_receive(:upload_asset).with(anything, "bar.foo", anything)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.9.travis.394.1
+  version: 1.5.9.travis.397.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec