dpl 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267de34ef36aefd6e0b78de417fb8f385a9ceb5d
-  data.tar.gz: 3d8ce9151696e3f9285bd8bb400c40f838ab2141
+  metadata.gz: b60ef07c3efd10ed791e52662655bf6ae8b9f25a
+  data.tar.gz: a03dc4e7e633af8bb810b961f88554e6e6e11b2f
 SHA512:
-  metadata.gz: d6ca1cfe5a1d1101f6e65b0812cf9c79eb5b66d3613181ed4ca261a8eec69b3390fe9585b20708107bf0710c3013ba560750d5c8b88d539f6d4aaa24b25e8076
-  data.tar.gz: 44ed924d345248cab30f8500b5dc214de372c67e7eb0c01ba9682e02a4c9d26043c0fe7c91c02ae032aa49394f3ad628187f166b89350f665d1d19ec3cc593fe
+  metadata.gz: ca7d8f39d87084784d1217e2fbeda9cbfb56aa7c8cfb8330e88ce4ebd6502956db4228cb6374adb614c2ecf749113b211c4bdeddf47c85843030ee2da1bd5965
+  data.tar.gz: d9e896346cae4da0c2ce91de14f924177e49863a11b7b36cb1d1ea782cb6e88535c34a850b8b4aa09b067717c2a018bd18a4364496392f8e9e08b8ff55eaf700

data/lib/dpl/cli.rb

@@ -50,6 +50,10 @@ module DPL
       }
     end
 
+    def shell(command)
+      system(command)
+    end
+
     def die(message)
       $stderr.puts(message)
       exit 1

data/lib/dpl/provider.rb

@@ -29,18 +29,26 @@ module DPL
       load    = options[:load]    || name
       gem(name, version)
     rescue LoadError
-      system("gem install %s -v %p" % [name, version])
+      context.shell("gem install %s -v %p" % [name, version])
       Gem.clear_paths
     ensure
       require load
     end
 
+    def self.context
+      self
+    end
+
+    def self.shell(command)
+      system(command)
+    end
+
     def self.pip(name, command = name)
-      system "pip install #{name}" if `which #{command}`.chop.empty?
+      context.shell "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?
+      context.shell "npm install -g #{name}" if `which #{command}`.chop.empty?
     end
 
     attr_reader :context, :options
@@ -68,6 +76,8 @@ module DPL
           setup_key(".dpl/id_rsa.pub")
           setup_git_ssh(".dpl/git-ssh", ".dpl/id_rsa")
         end
+
+        cleanup
       end
 
       context.fold("Deploying application") { push_app }
@@ -83,6 +93,15 @@ module DPL
       remove_key if needs_key?
     end
 
+    def sha
+      @sha ||= ENV['TRAVIS_COMMIT'] || `git rev-parse HEAD`.strip
+    end
+
+    def cleanup
+      context.shell "git reset --hard #{sha}"
+      context.shell "git clean -dffqx -e .dpl"
+    end
+
     def needs_key?
       true
     end
@@ -91,7 +110,7 @@ module DPL
     end
 
     def create_key(file)
-      system "ssh-keygen -t rsa -N \"\" -C #{option(:key_name)} -f #{file}"
+      context.shell "ssh-keygen -t rsa -N \"\" -C #{option(:key_name)} -f #{file}"
     end
 
     def setup_git_ssh(path, key_path)

data/lib/dpl/provider/dot_cloud.rb

@@ -5,7 +5,7 @@ module DPL
       pip 'dotcloud'
 
       def check_auth
-        system "echo #{option(:api_key)} | dotcloud setup --api-key"
+        context.shell "echo #{option(:api_key)} | dotcloud setup --api-key"
       end
 
       def check_app

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

@@ -33,7 +33,7 @@ module DPL
         end
 
         def push_app
-          system "git push #{option(:git)} HEAD:master -f"
+          context.shell "git push #{option(:git)} HEAD:master -f"
         end
 
         def run(command)

data/lib/dpl/provider/nodejitsu.rb

@@ -32,7 +32,7 @@ module DPL
       end
 
       def push_app
-        system "jitsu deploy -j #{CONFIG_FILE} --release=yes"
+        context.shell "jitsu deploy -j #{CONFIG_FILE} --release=yes"
       end
     end
   end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/provider/heroku_spec.rb

@@ -69,7 +69,7 @@ describe DPL::Provider::Heroku do
     describe :push_app do
       example do
         provider.options[:git] = "git://something"
-        provider.should_receive(:system).with("git push git://something HEAD:master -f")
+        provider.context.should_receive(:shell).with("git push git://something HEAD:master -f")
         provider.push_app
       end
     end

data/spec/provider_spec.rb

@@ -27,7 +27,7 @@ describe DPL::Provider do
 
     example "missing" do
       example_provider.should_receive(:gem).with("foo", "~> 1.4").and_raise(LoadError)
-      example_provider.should_receive(:system).with('gem install foo -v "~> 1.4"')
+      example_provider.context.should_receive(:shell).with('gem install foo -v "~> 1.4"')
       example_provider.requires("foo", :version => "~> 1.4")
     end
   end
@@ -41,7 +41,7 @@ describe DPL::Provider do
 
     example "missing" do
       example_provider.should_receive(:`).with("which foo").and_return("")
-      example_provider.should_receive(:system).with("pip install foo")
+      example_provider.context.should_receive(:shell).with("pip install foo")
       example_provider.pip("foo")
     end
   end
@@ -71,7 +71,7 @@ describe DPL::Provider do
 
   describe :create_key do
     example do
-      provider.should_receive(:system).with('ssh-keygen -t rsa -N "" -C foo -f thekey')
+      provider.context.should_receive(:shell).with('ssh-keygen -t rsa -N "" -C foo -f thekey')
       provider.create_key('thekey')
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ SimpleCov.start do
 end
 
 class DummyContext
+  def shell(command)
+  end
+
   def fold(message)
     yield
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec