dpl 1.5.2.travis.193.2 → 1.5.2.travis.194.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjAxODdiNjNjYmU3NDBhY2UxYzQxNzM4ZTg0OTIwMzdkNDhjZTVjMA==
+    ODQ4N2MxODI1MDMyYjEwYWRiZjI0NDI1ZWFjMzA4MDM3OGRhOThlYQ==
   data.tar.gz: !binary |-
-    M2ZmM2YyMTVlMDNkOTU5ZGI1MzlhNWZkOGNjZmJkMDE3ZWY5MDNiZQ==
+    MWI4MTNmZThiMjExYjJlMzI5MmE1NmQ0NDNlYWNiMzk3ODkxMGM4Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzA2M2RkODE1ZjhlNjJkYjkzMzJjOTFkNWY0ZDExOThiMDVkOWFmZjA4ZDc3
-    YzU5OTcxMTM2YTU0YjY3ZGVhNjM0NjA0ODA5YTUwNmYwYmJlMGZjYTViOTc1
-    ZDE0YTE5MjQyMmM0MDAyNGUxOTdjOTRjYzMzZjkzZTllMDFkYzY=
+    MDg3MDVjNThmZWQyMzM3ZGU3NTY0ODFmMzFlMzU4ZGNjZjJiNmE3NWNlOWUy
+    NGZhOTgxYjg1ZjM2MzIyNTE5NjA0ZWJjNDVkMTY0OWVhZTcwZTU2NDI1Mzcy
+    OGY1MWUwMmU4N2NhMDQwYTc2ZTQwZThmZWRlMGExOGNiYjU1YzQ=
   data.tar.gz: !binary |-
-    OGRhNDAwZWI3YzEwMWUyYzJkNzdjYmM3ODdmNDgwZjg3NWI1NmQ4MTM2OTJi
-    OTk0YzdkN2EwNzEzOTc5OTg0NmNjZDU2ODQ4OWY0ODE5YzdlNzlmMTQ1MGQx
-    NmNiNDRjNWIyNTY1NWM2YzhkY2ZhYTkwNDAyODk1YTcwMGRhODk=
+    NDc3NGQxOWU0ZWZhYjMzZjBjYjRiYjU4ZTA3ODBlZjBkMzg3NDMzNWUwOWI4
+    MGEzNjVmOTFjMDI5M2M1NzVhZjRlYjU5ODAyZDQ3MDQzM2IxZDhiZTIwMmQ4
+    ZDllYjk3ZjhmOTRhZWYwMTM2YmZhODcyZTBlMTU3YTRmNzMyYmM=

data/lib/dpl/provider.rb

@@ -37,7 +37,7 @@ module DPL
       load    = options[:load]    || name
       gem(name, version)
     rescue LoadError
-      context.shell("gem install %s -v %p" % [name, version])
+      context.shell("gem install %s -v %p" % [name, version], retry: true)
       Gem.clear_paths
     ensure
       require load
@@ -47,16 +47,17 @@ module DPL
       self
     end
 
-    def self.shell(command)
+    def self.shell(command, options = {})
+      command = "travis_retry #{command}" if options[:retry]
       system(command)
     end
 
     def self.pip(name, command = name)
-      context.shell "sudo pip install #{name}" if `which #{command}`.chop.empty?
+      context.shell("sudo pip install #{name}", retry: true) if `which #{command}`.chop.empty?
     end
 
     def self.npm_g(name, command = name)
-      context.shell "npm install -g #{name}" if `which #{command}`.chop.empty?
+      context.shell("npm install -g #{name}", retry: true) if `which #{command}`.chop.empty?
     end
 
     attr_reader :context, :options

data/spec/provider_spec.rb

@@ -26,7 +26,7 @@ describe DPL::Provider do
 
     example "missing" do
       example_provider.should_receive(:gem).with("foo", "~> 1.4").and_raise(LoadError)
-      example_provider.context.should_receive(:shell).with('gem install foo -v "~> 1.4"')
+      example_provider.context.should_receive(:shell).with('gem install foo -v "~> 1.4"', retry: true)
       example_provider.requires("foo", :version => "~> 1.4")
     end
   end
@@ -40,7 +40,7 @@ describe DPL::Provider do
 
     example "missing" do
       example_provider.should_receive(:`).with("which foo").and_return("")
-      example_provider.context.should_receive(:shell).with("sudo pip install foo")
+      example_provider.context.should_receive(:shell).with("sudo pip install foo", retry: true)
       example_provider.pip("foo")
     end
   end
@@ -120,15 +120,19 @@ describe DPL::Provider do
   end
 
   describe :shell do
-    example do
+    example "without any options" do
       example_provider.should_receive(:system).with("command")
       example_provider.shell("command")
     end
+    example "with retry: true" do
+      example_provider.should_receive(:system).with("travis_retry command")
+      example_provider.shell("command", retry: true)
+    end
   end
 
   describe :npm_g do
     example do
-      example_provider.context.should_receive(:shell).with("npm install -g foo")
+      example_provider.context.should_receive(:shell).with("npm install -g foo", retry: true)
       example_provider.npm_g("foo")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.2.travis.193.2
+  version: 1.5.2.travis.194.2
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec