toque 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73dad6ccfc72b57e6f052ad6d0b1c0e0e6fccaf
-  data.tar.gz: f86abf5d88d0be9e04c83130b9c485fe974a4999
+  metadata.gz: e731ee8504df30f8ad85efbd8235ebe23ad1548a
+  data.tar.gz: 52187cfc3e09a96d524cb15dca1f5ef6cb373aef
 SHA512:
-  metadata.gz: ae0e96e825701c42abb8aebae252d95d5ae8d3cdc2f3f36392237db9eb338eb34a5f4ee96169b70f7000b8b0720e70c2b72e5c0f31fcff8f5450892436176e12
-  data.tar.gz: 051acc336cbbd24b5530811cd28f478aa27b459754a48f1d9b1da545a29558a80e6dacde8f286eb33058ec60751be05e9715ed156bd3ded2845a4e4c6ecadef4
+  metadata.gz: f4869364d22d99093ec11a8aed5c15db576a903e368ac58203cfe46e90867f7fb9c8ee31946b471637e009734a956b0deed72ce9904d719f92e908acc0f36fd7
+  data.tar.gz: 2301bdee31eafc80c1f0c7c326b48601dc2e526a68554d36649de92ff964e89cb138f79f7e13619185184ccf2cb1673879644acb1d2c3bce4c5bb55456c91c6b

data/lib/toque/helpers.rb

@@ -38,7 +38,10 @@ module Toque
           # Search if curl is present
           #
           def curl?
-            !(capture('curl || true') =~ /not found/)
+            run 'curl'
+            true
+          rescue ::Capistrano::CommandError
+            false
           end
 
           # Install curl if not present

data/lib/toque/version.rb

@@ -1,7 +1,7 @@
 module Toque
   module VERSION
     MAJOR = 1
-    MINOR = 6
+    MINOR = 7
     PATCH = 0
     STAGE = nil
 

data/spec/toque/helpers_spec.rb

@@ -27,13 +27,26 @@ describe Toque::Helpers, 'loaded into capistrano' do
 
   describe '#curl?' do
     it 'return true if curl exists' do
-      @configuration.stub_command 'curl || true', data: "curl: try 'curl --help' or 'curl --manual' for more information"
+      @configuration.stub_command 'curl', data: "curl: try 'curl --help' or 'curl --manual' for more information"
       expect(@configuration.toque.curl?).to be_true
     end
 
     it 'return false if curl is missing' do
-      @configuration.stub_command 'curl || true', data: "sh: command not found"
+      @configuration.stub_command 'curl', fail: true
       expect(@configuration.toque.curl?).to be_false
     end
   end
+
+  describe '#require_curl' do
+    it 'should install curl if not present' do
+      @configuration.stub_command 'curl', fail: true
+      @configuration.stub_command "sudo -p 'sudo password: ' apt-get install --no-install-recommends -yq curl" do |_|
+        @configuration.stub_command 'curl', data: "curl: try 'curl --help' or 'curl --manual' for more information"
+      end
+
+      expect(@configuration.toque.curl?).to be_false
+      @configuration.toque.require_curl
+      expect(@configuration.toque.curl?).to be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toque
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jan Graichen