dpl 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f54b23388d9cba1b8f2f87a76c7761fb27325111
-  data.tar.gz: 4ab1bfb46e6e7dd95ed05cae4ffc4baee40a4148
+  metadata.gz: 45d759b440ccb1838b4738c28b23827a83db1a0c
+  data.tar.gz: 30db537d8213204f14c4e0974781eb00f34feeb9
 SHA512:
-  metadata.gz: 520f540c407d85bc0a0a2f4e49f3f31127361c45ef4cd4f5b4ea5bbe3b832d135769debe80dc8947a13cb9f6608df06f61d09ca37cf766203542fbfc18079d4f
-  data.tar.gz: 977ded497353b08f50255b1bd6d9850026293a2f741460062a04eb70e7af7a3b950799964ff9e9d40b340cd964e76ada9362e33aef874108bfe0ea2df855190a
+  metadata.gz: 116d8ce147d9eaac137e74ed1b1f56eb569efd48a0212fc0b5914be783289c1532409ec87d79861c779236ae954e5b1296c969b0d138260530351b4682817e87
+  data.tar.gz: eb0c13c8219333299a8809d490e264aaddb518d8fe4233657ecc751937f8c6437351e2a8a6183fa416fc7a585fc4aa49eb9c38e408c277a38303bebc9fbc835a

data/lib/dpl/provider.rb

@@ -8,6 +8,7 @@ module DPL
     autoload :Heroku,     'dpl/provider/heroku'
     autoload :EngineYard, 'dpl/provider/engine_yard'
     autoload :DotCloud,   'dpl/provider/dot_cloud'
+    autoload :Nodejitsu,  'dpl/provider/nodejitsu'
 
     def self.new(context, options)
       return super if self < Provider
@@ -38,6 +39,10 @@ module DPL
       system "pip install #{name}" if `which #{command}`.chop.empty?
     end
 
+    def self.npm_g(name, command = name)
+      system "npm install -g #{name}" if `which #{command}`.chop.empty?
+    end
+
     attr_reader :context, :options
 
     def initialize(context, options)
@@ -66,7 +71,11 @@ module DPL
       context.fold("Deploying application") { push_app }
 
       Array(options[:run]).each do |command|
-        context.fold("Running %p" % command) { run(command) }
+        if command == 'restart'
+          context.fold("Restarting application") { restart }
+        else
+          context.fold("Running %p" % command) { run(command) }
+        end
       end
     ensure
       remove_key if needs_key?
@@ -99,5 +108,13 @@ module DPL
     def log(message)
       $stderr.puts(message)
     end
+
+    def run(command)
+      error "running commands not supported"
+    end
+
+    def error(message)
+      raise Error, message
+    end
   end
 end

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

@@ -16,8 +16,9 @@ module DPL
         end
 
         def push_app
+          sha = ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
           response = Excon.post release_url,
-            :body    => { "slug_url" => slug_url, "description" => "Travis CI deploy" }.to_json,
+            :body    => { "slug_url" => slug_url, "description" => "Deploy #{sha} via Travis CI" }.to_json,
             :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
 
           print "\nDeploying slug "

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

@@ -42,6 +42,10 @@ module DPL
           Rendezvous.start(:url => rendezvous_url) unless rendezvous_url.nil?
         end
 
+        def restart
+          api.post_ps_restart option(:app)
+        end
+
         def deploy
           super
         rescue ::Heroku::API::Errors::NotFound => error

data/lib/dpl/provider/nodejitsu.rb

@@ -0,0 +1,41 @@
+module DPL
+  class Provider
+    class Nodejitsu < Provider
+      CONFIG_FILE = '.dpl/jitsu.json'
+
+      experimental "Nodejitsu"
+      requires 'json'
+      npm_g 'jitsu'
+
+      def config
+        {
+          "username"     => option(:username),
+          "apiToken"     => option(:api_key),
+          "apiTokenName" => "travis"
+        }
+      end
+
+      def check_auth
+        File.open(CONFIG_FILE, 'w') { |f| f << config.to_json }
+      end
+
+      def check_app
+        error "missing package.json" unless File.exist? 'package.json'
+
+        package = JSON.parse File.read('package.json')
+        message = "missing %s in package.json, see https://www.nodejitsu.com/documentation/appendix/package-json/"
+        error message % "subdomain"    unless package['subdomain']
+        error message % "node version" unless package['engines'] and package['engines']['node']
+        error message % "start script" unless package['scripts'] and package['scripts']['start']
+      end
+
+      def needs_key?
+        false
+      end
+
+      def push_app
+        system "jitsu deploy -j #{CONFIG_FILE}"
+      end
+    end
+  end
+end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/provider/heroku_spec.rb

@@ -83,6 +83,13 @@ describe DPL::Provider::Heroku do
       end
     end
 
+    describe :restart do
+      example do
+        api.should_receive(:post_ps_restart).with("example")
+        provider.restart
+      end
+    end
+
     describe :deploy do
       example "not found error" do
         provider.should_receive(:api) { raise ::Heroku::API::Errors::NotFound.new("the message", nil) }.at_least(:once)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,6 +76,7 @@ files:
 - lib/dpl/provider/heroku.rb
 - lib/dpl/provider/heroku/anvil.rb
 - lib/dpl/provider/heroku/git.rb
+- lib/dpl/provider/nodejitsu.rb
 - lib/dpl/version.rb
 - notes/dotcloud.md
 - notes/engine_yard.md