dpl 1.5.11.travis.437.1 → 1.5.11.travis.445.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGNiYTMyY2VmMzc3YWY2MmIzZTA3ODdlODMwNWJiN2Q1MWJkNmNhYg==
+    NDg1NzRiZTRmOTZmNmUyOTMzMjQ1ZjI3OTRiYjM3NmU2NTkzMmU5OQ==
   data.tar.gz: !binary |-
-    NzJmNDlhNDQzZjc0ZjMyOGVjODlkYjYwOGRlOThiN2FmYTFkOWIwYQ==
+    ZTFkYTA4OGU4YzUzMjkwMzliY2EyNWU4YmYzZWQ4YzdmYjZlZDZlMA==
 SHA512:
   metadata.gz: !binary |-
-    ZjJjN2Q2ZDU0MDRlMTYwMjVjM2JiYjU4YjFkODc1OGVkMzY2ZGQxYTMyNDY4
-    NGMxOTgyNjJmOGUwOTNhYmQ0MWM4MTBjNjI5N2M3NDZkN2E1ZmY4ZmU3MWNh
-    Y2VhZmI5MjZkMmFhNTI5YWI3NGUwMDBhODJlNmEzZTVjN2JhYWU=
+    Njg5Y2NmMGRjNmE5NjFkNzY1OWQxNmY1MzVkNWRkNmI4MTQ4OGMwOGY0ZTY3
+    YTJiYjYxZTcyNjNjYTJkMmIxNTNjOTYxYTM1YzA2ZTcyNGYxMzIzNmNlOTIz
+    N2E1NmVmNDAyNmIxNjNiOWVkM2Q3MWJmNWQyYzA5NzFmOTU3NWE=
   data.tar.gz: !binary |-
-    YmZlMmNhOWZiMjc5ZDhmMTdhNWQxMGZiYzRmYjkwYjc0ZjYwZWQ0MjdjN2M0
-    NzVkYzc3MTY0YTY3NTBkNGZiYzJkZGVlMDgxMDg2NzZiYWQyOWViZWYwZTFi
-    YjY5NmJlZTY2ZWU5YjM4N2JjZDVkMDlmY2E1NzFlMWU4NmYyMmI=
+    Y2UxMzM2ZWJiYjAzNTM5NjFkMjJiYzE4NmE1ZTgxMTljYTc3ZjMzZGVmNGVi
+    NDg0MjgwMjhkN2ZkYmZiYTdhOTEyMjdiZjU1ZDk2Y2EyYjM3ZTI0MGNlZjk3
+    NzY2MjllMzllNDgxZDdhN2Q1Y2FkMzhhMGYyMDY4YTgyOWJlZDM=

data/README.md

@@ -24,6 +24,7 @@ Dpl supports the following providers:
 * [Github Releases](#github-releases)
 * [Ninefold](#ninefold)
 * [Hackage](#hackage)
+* [Deis](#deis)
 
 ## Installation:
 
@@ -155,7 +156,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'
+    dpl --provider=pypi --user=<username> --password=<password> --server=`https://mypackageindex.com/index` --distributions='sdist bdist_wheel'
 
 ### NPM:
 
@@ -314,3 +315,15 @@ For accounts using two factor authentication, you have to use an oauth token as
 
     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/lib/dpl/provider.rb

@@ -25,6 +25,7 @@ module DPL
     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

data/lib/dpl/provider/deis.rb

@@ -0,0 +1,105 @@
+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/spec/provider/deis_spec.rb

@@ -0,0 +1,98 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.11.travis.437.1
+  version: 1.5.11.travis.445.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -90,6 +90,7 @@ 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
@@ -118,6 +119,7 @@ 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