dpl 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 478f6fafe432230c66b9452ba5072588ea0f9dc1
-  data.tar.gz: 45db3d5e7a930300a7a8779e084976c29548929d
+  metadata.gz: af89a10a5a1d66462990934a93215af341bbbfcf
+  data.tar.gz: 5400021aba1ffcea9549d910773ad0c90afd2ad7
 SHA512:
-  metadata.gz: bc6991fc24f3249decd6ceb3bd5fb584e14f5dce4304411b188222153702310c5fc0edfd162887ffd8fdf02630c9a50fc4a78fc48c502b2bede6da03ba9f4a6b
-  data.tar.gz: 7b3045f1eaabb9bf25f5706cc46d2aa2df5b63b3fd498868e226d4f45ddc1d2bc9344ec5f4534101c52f4bc2bb5e3b2489df75550f63d983f246ed709c0c8354
+  metadata.gz: dfa28b8549431d85202aa2b5148bd8afdb1e1243c0454682484bf9e7df19ac701c1ddb98170bf964fbe5341d11ab1a3765b301ff0fb36ef7e2f632cc60501cc3
+  data.tar.gz: b109321326bec28b89d239a387f74008593161e887b96738bc1228ad03147d0b904cb2b910b16a9de109eef56c90a98c0350caa1911f0cde0f2f38d8fc5e17e5

data/Gemfile

@@ -10,3 +10,7 @@ end
 group :openshift do
     gem 'rhc'
 end
+
+group :rubygems do
+  gem 'gems'
+end

data/README.md

@@ -11,3 +11,4 @@ Supported providers:
 * Openshift
 * Engine Yard (experimental)
 * dotCloud (experimental)
+* RubyGems (experimental)

data/lib/dpl/provider.rb

@@ -10,6 +10,7 @@ module DPL
     autoload :DotCloud,   'dpl/provider/dot_cloud'
     autoload :Nodejitsu,  'dpl/provider/nodejitsu'
     autoload :Openshift,  'dpl/provider/openshift'
+    autoload :RubyGems,   'dpl/provider/rubygems'
 
     def self.new(context, options)
       return super if self < Provider
@@ -64,47 +65,37 @@ module DPL
       end
     end
 
-    def should_deploy?
-      (not options[:tags_only] or has_tag?)
-    end
-
-    def has_tag?
-      context.shell('git describe --exact-match')
-      $?.success?
-    end
-
     def deploy
       rm_rf ".dpl"
       mkdir_p ".dpl"
-      if should_deploy?
-        context.fold("Preparing deploy") do
-          check_auth
-          check_app
-
-          if needs_key?
-            create_key(".dpl/id_rsa")
-            setup_key(".dpl/id_rsa.pub")
-            setup_git_ssh(".dpl/git-ssh", ".dpl/id_rsa")
-          end
-
-          cleanup
-        end
 
-        context.fold("Deploying application") { push_app }
+      context.fold("Preparing deploy") do
+        check_auth
+        check_app
 
-        Array(options[:run]).each do |command|
-          if command == 'restart'
-            context.fold("Restarting application") { restart }
-          else
-            context.fold("Running %p" % command) { run(command) }
-          end
+        if needs_key?
+          create_key(".dpl/id_rsa")
+          setup_key(".dpl/id_rsa.pub")
+          setup_git_ssh(".dpl/git-ssh", ".dpl/id_rsa")
         end
+
+        cleanup
       end
-      ensure
-        if needs_key?
-          remove_key rescue nil
+
+      context.fold("Deploying application") { push_app }
+
+      Array(options[:run]).each do |command|
+        if command == 'restart'
+          context.fold("Restarting application") { restart }
+        else
+          context.fold("Running %p" % command) { run(command) }
         end
       end
+    ensure
+      if needs_key?
+        remove_key rescue nil
+      end
+    end
 
     def sha
       @sha ||= ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip

data/lib/dpl/provider/rubygems.rb

@@ -0,0 +1,48 @@
+module DPL
+  class Provider
+    class RubyGems < Provider
+      experimental "RubyGems"
+
+      requires 'gems'
+
+      def setup_auth
+        ::Gems.key = option(:api_key) if options[:api_key]
+        ::Gems.username = option(:user) unless options[:api_key]
+        ::Gems.password = option(:password) unless options[:api_key]
+      end
+
+      def needs_key?
+        false
+      end
+
+      def setup_gem
+        options[:gem] ||= options[:app]
+      end
+
+      def gemspec
+        options[:gemspec].gsub('.gemspec', '') if options[:gemspec]
+      end
+
+      def check_app
+        setup_auth
+        setup_gem
+        info = ::Gems.info(options[:gem])
+        log "Found gem #{info['name']}"
+      end
+
+      def check_auth
+        setup_auth
+        log "Authenticated with username #{::Gems.username}" if ::Gems.username
+      end
+
+      def push_app
+        setup_auth
+        setup_gem
+        context.shell "gem build #{gemspec || option(:gem)}.gemspec"
+        Dir.glob("#{gemspec || option(:gem)}-*.gem") do |f|
+          log ::Gems.push File.new f
+        end
+      end
+    end
+  end
+end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/spec/provider/rubygems_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+require 'rubygems'
+require 'gems'
+require 'dpl/provider/rubygems'
+
+describe DPL::Provider::RubyGems do
+  subject :provider do
+    described_class.new(DummyContext.new, :app => 'example', :api_key => 'foo')
+  end
+
+  describe :api do
+    example "with an api key" do
+      ::Gems.should_receive(:key=).with('foo')
+      provider.setup_auth
+    end
+
+    example "with a username and password" do
+      provider.options.update(:user => 'test', :password => 'blah')
+      provider.options.delete(:api_key)
+      ::Gems.should_receive(:username=).with('test')
+      ::Gems.should_receive(:password=).with('blah')
+      provider.setup_auth
+    end
+  end
+
+  describe :check_auth do
+    example do
+      provider.options.update(:user => 'test', :password => 'blah')
+      provider.options.delete(:api_key)
+      provider.should_receive(:log).with("Authenticated with username test")
+      provider.check_auth
+    end
+  end
+
+  describe :check_app do
+    example do
+      ::Gems.should_receive(:info).with('example').and_return({'name' => 'example'})
+      provider.should_receive(:log).with("Found gem example")
+      provider.check_app
+    end
+  end
+
+  describe :push_app do
+    after(:each) do
+      File.should_receive(:new).with('File').and_return('Test file')
+      ::Gems.should_receive(:push).with('Test file').and_return('Yes!')
+      provider.should_receive(:log).with('Yes!')
+      provider.push_app
+    end
+
+    example "with options[:app]" do
+      provider.options.update(:app => 'example')
+      provider.context.should_receive(:shell).with("gem build example.gemspec")
+      Dir.should_receive(:glob).with('example-*.gem').and_yield('File')
+    end
+
+    example "with options[:gem]" do
+      provider.options.update(:gem => 'example-gem')
+      provider.context.should_receive(:shell).with("gem build example-gem.gemspec")
+      Dir.should_receive(:glob).with('example-gem-*.gem').and_yield('File')
+    end
+
+    example "with options[:gemspec]" do
+      provider.options.update(:gemspec => 'blah.gemspec')
+      provider.context.should_receive(:shell).with("gem build blah.gemspec")
+      Dir.should_receive(:glob).with('blah-*.gem').and_yield('File')
+    end
+  end
+
+  describe :setup_gem do
+    example "with options[:gem] and options[:app] set" do
+      provider.options.update(:gem => 'test', :app => 'blah')
+      provider.setup_gem
+      provider.options[:gem].should be == 'test'
+    end
+
+    example "with options[:app] set" do
+      provider.options.update(:app => 'foo')
+      provider.setup_gem
+      provider.options[:gem].should be == 'foo'
+    end
+
+    example "with options[:gem] set" do
+      provider.options.update(:gem => 'bar')
+      provider.setup_gem
+      provider.options[:gem].should be == 'bar'
+    end
+  end
+
+  describe :gemspec do
+    example do
+      provider.options.update(:gemspec => 'test.gemspec')
+      provider.gemspec.should be == 'test'
+    end
+  end
+end

data/spec/provider_spec.rb

@@ -132,19 +132,4 @@ describe DPL::Provider do
       expect { provider.error("Foo") }.to raise_error("Foo")
     end
   end
-
-  describe :has_tag? do
-    example do
-      provider.context.should_receive(:shell).with('git describe --exact-match')
-      provider.has_tag?
-    end
-  end
-
-  describe :should_deploy? do
-    example "tags_only with tag" do
-      provider.options[:tags_only] = true
-      provider.should_receive(:has_tag?).and_return(true)
-      provider.should_deploy?.should be == true
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,6 +92,7 @@ files:
 - lib/dpl/provider/heroku/git.rb
 - lib/dpl/provider/nodejitsu.rb
 - lib/dpl/provider/openshift.rb
+- lib/dpl/provider/rubygems.rb
 - lib/dpl/version.rb
 - notes/dotcloud.md
 - notes/engine_yard.md
@@ -101,6 +102,7 @@ files:
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_spec.rb
 - spec/provider/openshift_spec.rb
+- spec/provider/rubygems_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rkh/dpl
@@ -133,6 +135,7 @@ test_files:
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_spec.rb
 - spec/provider/openshift_spec.rb
+- spec/provider/rubygems_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
 has_rdoc: