dpl 1.4.9.travis.151.2 → 1.4.9.travis.163.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTJlMWQyZDI4MmU2NTVhZDJlZjFiOGRiMTY5YzhlNTQ3YzU4YzY3Mw==
+    ODEyMzVkOTllYjhjYjE0NWNmNTAxNWFiMjdiYTgwMjFmMDIzMjcwNQ==
   data.tar.gz: !binary |-
-    YTcwNjE5MjE0MWJkZDk2MWU0MDliNjBhOWJkY2ZiYWNmNTg1ZDNhZQ==
+    ZTJhYTljMWI4NDMzYzQzZTkzMzhjOWY5N2E2ZDM5NDZhZDQ2NzkyNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTRlOTkzN2Q2MDQzMjRmMDcxMDI5MTYxOWZkZmI5NjE2YjhkZTViYTA2Mzlk
-    YWIwYTRjZTQxOTFhM2I3ZjI4YmE1Yjc3MThhZTdmYmYxNzYxYzg4ZDU4ODVk
-    ZWY2ZTI5YWI2MzQwYTIxOWY0NGQwOWNhYzI5YmFkMWI3NmFhOTA=
+    MTFmOGEzYjUwNjYyYzFkNDZkYjRhZGJkYmFhOWRhNDEwNWYzM2Y5OTIwNWVi
+    YTVjNzBiMDQyMGRlNjY4MmJmODhhOTFlYWZjZWYxY2UwNWVhNjU0YzM3NDdl
+    OWY2Y2NkMTNjZDIzMWYwMGUwYTNhYjU5YWQ1NDA1YzhjYWQ1MzE=
   data.tar.gz: !binary |-
-    ZjZiNmE3NzFjMWM3NWJlODU0N2U3MjJjMjIwNzQ0ZDhmMjNlNWM5MTM1MDU1
-    N2JjM2QyZmE4ODYyNDI2MmVhNWJkYTZhYWYyMTk0NzY3MTEwNzdiMDEzZDdm
-    OGQ3ZTAwOThlZTdlOGQwMjA4OTE1YWVhYTc2ODMzODc3ZTBiNTg=
+    NDkzODBjYmY5MjZmM2Q2ODQ4Yzc3YzhjM2ExMzBmYmM3ZTg0ZTM5MWYwOTUw
+    NzFjOGE5NjY3MGFhNWYxOTlhNjlmNTU3ZmY2ZDQxYjFhZmE5NTBjMjA0Y2Zj
+    MWVlOTIzN2NiMDUyNGZmNzk1MWY1MWE0MTJhOGU3NzQwMWEwM2E=

data/lib/dpl/provider.rb

@@ -107,8 +107,14 @@ module DPL
 
     def cleanup
       return if options[:skip_cleanup]
-      context.shell "git reset --hard #{sha}"
-      context.shell "git clean -dffqx -e .dpl"
+      context.shell "mv .dpl ~/dpl"
+      context.shell "git stash --all"
+      context.shell "mv ~/dpl .dpl"
+    end
+
+    def uncleanup
+      return if options[:skip_cleanup]
+      context.shell "git stash pop"
     end
 
     def needs_key?

data/lib/dpl/provider/cloud_foundry.rb

@@ -24,6 +24,8 @@ module DPL
       def cleanup
       end
 
+      def uncleanup
+      end
     end
   end
 end

data/lib/dpl/provider/engine_yard.rb

@@ -46,7 +46,9 @@ module DPL
       end
 
       def cleanup
-        #DONT
+      end
+
+      def uncleanup
       end
 
       def push_app

data/spec/provider_spec.rb

@@ -70,9 +70,9 @@ describe DPL::Provider do
 
   describe :cleanup do
     example do
-      provider.should_receive(:sha).and_return("sha")
-      provider.context.should_receive(:shell).with('git reset --hard sha')
-      provider.context.should_receive(:shell).with('git clean -dffqx -e .dpl')
+      provider.context.should_receive(:shell).with('mv .dpl ~/dpl')
+      provider.context.should_receive(:shell).with('git stash --all')
+      provider.context.should_receive(:shell).with('mv ~/dpl .dpl')
       provider.cleanup
     end
 
@@ -83,6 +83,19 @@ describe DPL::Provider do
     end
   end
 
+  describe :uncleanup do
+    example do
+      provider.context.should_receive(:shell).with('git stash pop')
+      provider.uncleanup
+    end
+
+    example "skip cleanup" do
+      provider.options.should_receive(:[]).with(:skip_cleanup).and_return("true")
+      provider.context.should_not_receive(:shell)
+      provider.uncleanup
+    end
+  end
+
   describe :create_key do
     example do
       provider.context.should_receive(:shell).with('ssh-keygen -t rsa -N "" -C foo -f thekey')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.4.9.travis.151.2
+  version: 1.4.9.travis.163.2
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec