dpl 1.5.11.travis.445.1 → 1.6.0.travis.399.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDg1NzRiZTRmOTZmNmUyOTMzMjQ1ZjI3OTRiYjM3NmU2NTkzMmU5OQ==
+    MDcyNmVkMzAxNWJkZjgwNDQ5NTQyZWRmZTFhOGJhMDNiNzRjNGNhZA==
   data.tar.gz: !binary |-
-    ZTFkYTA4OGU4YzUzMjkwMzliY2EyNWU4YmYzZWQ4YzdmYjZlZDZlMA==
+    ODJhNDlhZDBjN2VlMjQ2YWU5ZTI4MDkyMGExMDBjYTYyZmMxMWYwMg==
 SHA512:
   metadata.gz: !binary |-
-    Njg5Y2NmMGRjNmE5NjFkNzY1OWQxNmY1MzVkNWRkNmI4MTQ4OGMwOGY0ZTY3
-    YTJiYjYxZTcyNjNjYTJkMmIxNTNjOTYxYTM1YzA2ZTcyNGYxMzIzNmNlOTIz
-    N2E1NmVmNDAyNmIxNjNiOWVkM2Q3MWJmNWQyYzA5NzFmOTU3NWE=
+    ODMxZGYyNWVjMmNiYzY2MGNkY2MzNWQ4MWYxZjdhNDlmMzU0YWJkYmE4YzAz
+    OTRjMDFhMjMyYmNiNzkxNGM1NmMxYjA1NDJlOTQ0ZmJmNTNiZjYxMDZlMzk5
+    NThhYTBmMzY4YzU4YWIzMmI4MGM4YzM2YzZhZGY2M2UzYmEyNTI=
   data.tar.gz: !binary |-
-    Y2UxMzM2ZWJiYjAzNTM5NjFkMjJiYzE4NmE1ZTgxMTljYTc3ZjMzZGVmNGVi
-    NDg0MjgwMjhkN2ZkYmZiYTdhOTEyMjdiZjU1ZDk2Y2EyYjM3ZTI0MGNlZjk3
-    NzY2MjllMzllNDgxZDdhN2Q1Y2FkMzhhMGYyMDY4YTgyOWJlZDM=
+    Y2EzYWZhMTY0NmQ0ODZhZDY3MWQ5MDc4NzYwYjRhNzYyZDJlMzFiMTgzYmQx
+    MGVhODExMTNjMjc5NmZjYTk2Y2U1OWM5ZDUyMjNmYjhiOWRiYjkwODU2MTI5
+    MzE5NmE1NmM2YWJiODE4MTUzMWE1NjYyMzFmODBiYWM0YTRmODc=

data/README.md

@@ -23,8 +23,6 @@ Dpl supports the following providers:
 * [Modulus](#modulus)
 * [Github Releases](#github-releases)
 * [Ninefold](#ninefold)
-* [Hackage](#hackage)
-* [Deis](#deis)
 
 ## Installation:
 
@@ -156,7 +154,7 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 #### Examples:
 
     dpl --provider=pypi --user=<username> --password=<password>
-    dpl --provider=pypi --user=<username> --password=<password> --server=`https://mypackageindex.com/index` --distributions='sdist bdist_wheel'
+    dpl --provider=pypi --user=<username> --password=<password> --server=`https://mypackageindex.com/index` --distributions='sdist bdist'
 
 ### NPM:
 
@@ -273,7 +271,6 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **password**: GitHub Password. Not necessary if `api-key` is used.
 * **repo**: GitHub Repo. Defaults to git repo's name.
 * **file**: File to upload to GitHub Release.
-* **release-number**: Overide automatic release detection, set a release manually.
 
 #### GitHub Two Factor Authentication
 
@@ -303,27 +300,3 @@ For accounts using two factor authentication, you have to use an oauth token as
 #### Examples:
 
     dpl --provider=ninefold --auth_token=<auth_token> --app_id=<app_id>
-
-### Hackage:
-
-#### Options:
-
-* **username**: Hackage username.
-* **password**: Hackage password.
-
-#### Examples:
-
-    dpl --provider=hackage --username=<username> --password=<password>
-
-### Deis:
-
-#### Options:
-
-* **controller**: Deis controller e.g. deis.deisapps.com
-* **username**: Deis username
-* **password**: Deis password
-* **app**: Deis app
-
-#### Examples:
-
-    dpl --provider=deis --controller=deis.deisapps.com --username=travis --password=secret --app=example

data/dpl.gemspec

@@ -22,9 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json'
 
   # prereleases from Travis CI
-  if ENV['CI']
-    digits = s.version.to_s.split '.'
-    digits[-1] = digits[-1].to_s.succ
-    s.version = digits.join('.') + ".travis.#{ENV['TRAVIS_JOB_NUMBER']}"
-  end
+  s.version = s.version.to_s.succ + ".travis.#{ENV['TRAVIS_JOB_NUMBER']}" if ENV['CI']
 end

data/lib/dpl/provider.rb

@@ -24,8 +24,6 @@ module DPL
     autoload :Releases,     'dpl/provider/releases'
     autoload :Cloud66,      'dpl/provider/cloud66'
     autoload :Ninefold,     'dpl/provider/ninefold'
-    autoload :Hackage,      'dpl/provider/hackage'
-    autoload :Deis,         'dpl/provider/deis'
 
     def self.new(context, options)
       return super if self < Provider
@@ -60,10 +58,6 @@ module DPL
       system(command)
     end
 
-    def self.apt_get(name, command = name)
-      context.shell("sudo apt-get -qq install #{name}", retry: true) if `which #{command}`.chop.empty?
-    end
-
     def self.pip(name, command = name)
       context.shell("sudo pip install #{name}", retry: true) if `which #{command}`.chop.empty?
     end

data/lib/dpl/provider/cloudcontrol.rb

@@ -42,7 +42,7 @@ module DPL
 
       def push_app
         branch = (dep_name == 'default') ? 'master' : dep_name
-        context.shell "git push #{ @repository } HEAD:#{ branch } -f"
+        context.shell "git push #{ @repository } HEAD:#{ branch };"
         deploy_app
       end
 

data/lib/dpl/provider/heroku/git.rb

@@ -19,12 +19,9 @@ module DPL
         end
 
         def check_app
-          log "checking for app '#{option(:app)}'"
           info = api.get_app(option(:app)).body
           options[:git] ||= info['git_url']
-          log "found app '#{info['name']}'"
-        rescue ::Heroku::API::Errors::Forbidden => error
-          raise Error, "#{error.message} (does the app '#{option(:app)}' exist and does your account have access to it?)", error.backtrace
+          log "found app #{info['name']}"
         end
 
         def setup_key(file)
@@ -59,4 +56,4 @@ module DPL
       end
     end
   end
-end
+end

data/lib/dpl/provider/openshift.rb

@@ -33,12 +33,7 @@ module DPL
       end
 
       def push_app
-        if app.deployment_branch
-          context.shell "rhc app configure #{app.name} --deployment-branch #{app.deployment_branch}"
-          context.shell "git push #{app.git_url} -f #{app.deployment_branch}"
-        else
-          context.shell "git push #{app.git_url} -f"
-        end
+        context.shell "git push #{app.git_url} -f"
       end
 
       def restart

data/lib/dpl/provider/releases.rb

@@ -6,7 +6,7 @@ module DPL
       requires 'octokit'
       requires 'mime-types'
 
-      def get_tag
+      def get_tag 
         `git describe --tags --exact-match 2>/dev/null`.chomp
       end
 
@@ -27,7 +27,7 @@ module DPL
       end
 
       def user
-        @user ||= api.user
+        user ||= api.user
       end
 
       def needs_key?
@@ -49,7 +49,7 @@ module DPL
         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
 
@@ -57,15 +57,10 @@ module DPL
         tag_matched = false
         release_url = nil
 
-        if options[:release_number]
-          tag_matched = true
-          release_url = "https://api.github.com/repos/" + slug + "/releases/" + options[:release_number]
-        else
-          releases.each do |release|
-            if release.tag_name == get_tag
-              release_url = release.rels[:self].href
-              tag_matched = true
-            end
+        releases.each do |release|
+          if release.tag_name == get_tag
+            release_url = release.rels[:self].href
+            tag_matched = true
           end
         end
 
@@ -85,7 +80,7 @@ module DPL
           if already_exists
             log "#{filename} already exists, skipping."
           else
-            api.upload_asset(release_url, file, {:name => filename, :content_type => MIME::Types.type_for(file).first.to_s})
+            api.upload_asset(release_url, filename, {:content_type => MIME::Types.type_for(file).first.to_s})
           end
         end
       end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.5.10'
+  VERSION = '1.5.9'
 end

data/spec/provider/cloudcontrol_spec.rb

@@ -85,7 +85,7 @@ describe DPL::Provider::CloudControl do
   it '#push_app shuld deploy the app' do
     provider.instance_variable_set(:@repository, 'foo_repo.git')
     context = double(:shell)
-    context.should receive(:shell).with("git push foo_repo.git HEAD:master -f")
+    context.should receive(:shell).with("git push foo_repo.git HEAD:master;")
     provider.should receive(:context).and_return context
     provider.should receive(:deploy_app)
 

data/spec/provider/heroku_git_spec.rb

@@ -45,7 +45,7 @@ describe DPL::Provider::Heroku do
 
     describe :check_app do
       example do
-        provider.should_receive(:log).at_least(1).times.with(/example/)
+        provider.should_receive(:log).with("found app example")
         provider.check_app
         provider.options[:git].should be == "GIT URL"
       end

data/spec/provider/openshift_spec.rb

@@ -65,19 +65,10 @@ describe DPL::Provider::Openshift do
     end
 
     describe :push_app do
-      example "when app.deployment_branch is not set" do
-        provider.app.should_receive :deployment_branch
+      example do
         provider.context.should_receive(:shell).with("git push git://something -f")
         provider.push_app
       end
-
-      example "when app.deployment_branch is set" do
-        provider.app.stub(:deployment_branch) { "test-branch" }
-
-        provider.context.should_receive(:shell).with("rhc app configure example --deployment-branch test-branch")
-        provider.context.should_receive(:shell).with("git push git://something -f test-branch")
-        provider.push_app
-      end
     end
 
     describe :restart do

data/spec/provider/releases_spec.rb

@@ -86,8 +86,8 @@ describe DPL::Provider::Releases do
       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, "test/foo.bar", {:name=>"foo.bar", :content_type=>""})
-      provider.api.should_receive(:upload_asset).with(anything, "bar.foo", {:name=>"bar.foo", :content_type=>""})
+      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
@@ -111,7 +111,7 @@ describe DPL::Provider::Releases do
       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", {:name=>"bar.foo", :content_type=>""})
+      provider.api.should_receive(:upload_asset).with(anything, "bar.foo", anything)
       provider.should_receive(:log).with("foo.bar already exists, skipping.")
 
       provider.push_app
@@ -139,26 +139,8 @@ describe DPL::Provider::Releases do
       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, "test/foo.bar", {:name=>"foo.bar", :content_type=>""})
-      provider.api.should_receive(:upload_asset).with(anything, "bar.foo", {:name=>"bar.foo", :content_type=>""})
-
-      provider.push_app
-    end
-
-    example "With Release Number" do
-      allow_message_expectations_on_nil
-
-      provider.options.update(:file => ["bar.foo"])
-      provider.options.update(:release_number => "1234")
-
-      provider.stub(:slug).and_return("foo/bar")
-
-      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("https://api.github.com/repos/foo/bar/releases/1234", "bar.foo", {:name=>"bar.foo", :content_type=>""})
+      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

data/spec/provider_spec.rb

@@ -31,20 +31,6 @@ describe DPL::Provider do
     end
   end
 
-  describe :apt_get do
-    example "installed" do
-      example_provider.should_receive(:`).with("which foo").and_return("/bin/foo\n")
-      example_provider.should_not_receive(:system)
-      example_provider.apt_get("foo")
-    end
-
-    example "missing" do
-      example_provider.should_receive(:`).with("which foo").and_return("")
-      example_provider.context.should_receive(:shell).with("sudo apt-get -qq install foo", retry: true)
-      example_provider.apt_get("foo")
-    end
-  end
-
   describe :pip do
     example "installed" do
       example_provider.should_receive(:`).with("which foo").and_return("/bin/foo\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.11.travis.445.1
+  version: 1.6.0.travis.399.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -90,11 +90,9 @@ files:
 - lib/dpl/provider/cloud_files.rb
 - lib/dpl/provider/cloud_foundry.rb
 - lib/dpl/provider/cloudcontrol.rb
-- lib/dpl/provider/deis.rb
 - lib/dpl/provider/divshot.rb
 - lib/dpl/provider/dot_cloud.rb
 - lib/dpl/provider/engine_yard.rb
-- lib/dpl/provider/hackage.rb
 - lib/dpl/provider/heroku.rb
 - lib/dpl/provider/heroku/anvil.rb
 - lib/dpl/provider/heroku/git.rb
@@ -119,10 +117,8 @@ files:
 - spec/provider/cloud_files_spec.rb
 - spec/provider/cloudcontrol_spec.rb
 - spec/provider/cloudfoundry_spec.rb
-- spec/provider/deis_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/dotcloud_spec.rb
-- spec/provider/hackage_spec.rb
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_deploy_key_spec.rb
 - spec/provider/heroku_git_spec.rb

data/lib/dpl/provider/deis.rb

@@ -1,105 +0,0 @@
-module DPL
-  class Provider
-    class Deis < Provider
-      experimental 'Deis'
-      pip 'deis', 'deis'
-
-      def needs_key?
-        true
-      end
-
-      def check_auth
-        unless context.shell "deis login #{controller_url}" \
-                      " --username=#{option(:username)}" \
-                      " --password=#{option(:password)}"
-          error 'Login failed.'
-        end
-      end
-
-      def check_app
-        unless context.shell "deis apps:info --app=#{option(:app)}"
-          error 'Application could not be verified.'
-        end
-      end
-
-      def setup_key(file)
-        unless context.shell "deis keys:add #{file}"
-          error 'Adding keys failed.'
-        end
-      end
-
-      def setup_git_ssh(path, key_path)
-        super(path, key_path)
-        # Deis uses a non-standard port, so we need to create a
-        # ssh config shortcut
-        key_path = File.expand_path(key_path)
-        add_ssh_config_entry(key_path)
-        # A git remote is required for running commands
-        # https://github.com/deis/deis/issues/1086
-        add_git_remote
-      end
-
-      def remove_key
-        unless context.shell "deis keys:remove #{option(:key_name)}"
-          error 'Removing keys failed.'
-        end
-      end
-
-      def push_app
-        wait_until_key_is_set
-        unless context.shell "git push #{git_push_url} HEAD:refs/heads/master -f"
-          error 'Deploying application failed.'
-        end
-      end
-
-      def run(command)
-        unless context.shell "deis apps:run #{command}"
-          error 'Running command failed.'
-        end
-      end
-
-      private
-
-      def wait_until_key_is_set
-        sleep 5
-      end
-
-      def ssh_config_entry(key_file)
-        "\nHost deis-repo\n" \
-        "  Hostname #{option(:controller)}\n" \
-        "  Port 2222\n" \
-        "  User git\n" \
-        "  IdentityFile #{key_file}\n"
-      end
-
-      def add_ssh_config_entry(key_file)
-        FileUtils.mkdir_p(ssh_config_dir)
-        File.open(ssh_config, 'a') { |f| f.write(ssh_config_entry(key_file)) }
-      end
-
-      def ssh_config
-        File.join(ssh_config_dir, 'config')
-      end
-
-      def ssh_config_dir
-        File.join(Dir.home, '.ssh')
-      end
-
-      def add_git_remote
-        context.shell "git remote add deis #{git_remote_url}"
-      end
-
-      def git_push_url
-        "deis-repo:#{option(:app)}.git"
-      end
-
-      def git_remote_url
-        "ssh://git@#{option(:controller)}:2222/#{option(:app)}.git"
-      end
-
-      def controller_url
-        "http://#{option(:controller)}"
-      end
-    end
-  end
-end

data/lib/dpl/provider/hackage.rb

@@ -1,29 +0,0 @@
-module DPL
-  class Provider
-    class Hackage < Provider
-      apt_get 'cabal', 'cabal-install'
-
-      def check_auth
-        unless option(:username) and option(:password)
-          raise Error, "must supply username and password"
-        end
-      end
-
-      def check_app
-        context.shell "cabal check" or raise Error, "cabal check failed"
-      end
-
-      def needs_key?
-        false
-      end
-
-      def push_app
-        context.shell "cabal sdist" or raise Error, "cabal sdist failed"
-        Dir.glob("dist/*.tar.gz") do |tar|
-          context.shell "cabal upload --username=#{option(:username)} --password=#{option(:password)} #{tar}"
-        end
-      end
-    end
-  end
-end
-

data/spec/provider/deis_spec.rb

@@ -1,98 +0,0 @@
-require 'spec_helper'
-require 'dpl/provider/deis'
-
-describe DPL::Provider::Deis do
-  subject :provider do
-    described_class.new(DummyContext.new, :app => 'example',
-                                          :key_name => 'key',
-                                          :controller => 'deis.deisapps.com',
-                                          :username => 'travis',
-                                          :password => 'secret')
-  end
-
-  describe :needs_key? do
-    example do
-      expect(provider.needs_key?).to eq(true)
-    end
-  end
-
-  describe :check_auth do
-    example do
-      expect(provider.context).to receive(:shell).with(
-        'deis login http://deis.deisapps.com --username=travis --password=secret'
-      ).and_return(true)
-      provider.check_auth
-    end
-  end
-
-  describe :check_app do
-    example do
-      expect(provider.context).to receive(:shell).with(
-        'deis apps:info --app=example'
-      ).and_return(true)
-      provider.check_app
-    end
-  end
-
-  describe :setup_key do
-    let(:ssh_config_handle) { double 'ssh_config_handle' }
-    let(:ssh_config) { File.join(Dir.home, '.ssh', 'config') }
-    let(:identity_file) { File.join(Dir.pwd, 'key_file') }
-    example do
-      expect(provider.context).to receive(:shell).with(
-        'deis keys:add key_file'
-      ).and_return(true)
-      provider.setup_key('key_file')
-    end
-  end
-
-  describe :setup_git_ssh do
-    let(:ssh_config_handle) { double 'ssh_config_handle' }
-    let(:ssh_config) { File.join(Dir.home, '.ssh', 'config') }
-    let(:identity_file) { File.join(Dir.pwd, 'key_file') }
-    let(:git_ssh) { File.join(Dir.pwd, 'foo') }
-    after { FileUtils.rm ENV.delete('GIT_SSH') }
-
-    example do
-      expect(File).to receive(:open).with(git_ssh, 'w').and_call_original
-      expect(File).to receive(:open).with(ssh_config, 'a')
-        .and_yield(ssh_config_handle)
-
-      expect(ssh_config_handle).to receive(:write).with(
-        "\nHost deis-repo\n  Hostname deis.deisapps.com\n  Port 2222\n" \
-        "  User git\n  IdentityFile #{identity_file}\n"
-      )
-      expect(provider.context).to receive(:shell).with(
-        'git remote add deis ssh://git@deis.deisapps.com:2222/example.git'
-      )
-      provider.setup_git_ssh('foo', 'key_file')
-    end
-  end
-
-  describe :remove_key do
-    example do
-      expect(provider.context).to receive(:shell).with(
-        'deis keys:remove key'
-      ).and_return(true)
-      provider.remove_key
-    end
-  end
-
-  describe :push_app do
-    example do
-      expect(provider.context).to receive(:shell).with(
-        'git push deis-repo:example.git HEAD:refs/heads/master -f'
-      ).and_return(true)
-      provider.push_app
-    end
-  end
-
-  describe :run do
-    example do
-      expect(provider.context).to receive(:shell).with(
-        'deis apps:run shell command'
-      ).and_return(true)
-      provider.run('shell command')
-    end
-  end
-end

data/spec/provider/hackage_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-require 'dpl/provider/hackage'
-
-describe DPL::Provider::Hackage do
-  subject :provider do
-    described_class.new(DummyContext.new, :username => 'FooUser', :password => 'bar')
-  end
-
-  describe :check_auth do
-    it 'should require username' do
-      provider.options.update(:username => nil)
-      expect {
-        provider.check_auth
-      }.to raise_error(DPL::Error)
-    end
-
-    it 'should require password' do
-      provider.options.update(:password => nil)
-      expect {
-        provider.check_auth
-      }.to raise_error(DPL::Error)
-    end
-  end
-
-  describe :check_app do
-    it 'calls cabal' do
-      provider.context.should_receive(:shell).with("cabal check").and_return(true)
-      provider.check_app
-    end
-
-    it 'fails when cabal complains' do
-      provider.context.should_receive(:shell).with("cabal check").and_return(false)
-      expect {
-        provider.check_app
-      }.to raise_error(DPL::Error)
-    end
-  end
-
-  describe :push_app do
-    example do
-      provider.context.should_receive(:shell).with("cabal sdist").and_return(true)
-      Dir.should_receive(:glob).and_yield('dist/package-0.1.2.3.tar.gz')
-      provider.context.should_receive(:shell).with("cabal upload --username=FooUser --password=bar dist/package-0.1.2.3.tar.gz")
-      provider.push_app
-    end
-  end
-end