herkko 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f393b03d0f4118e1150a7f929eea8e581789bcbc
-  data.tar.gz: 39d8803698ed63fc0bdccbd71a64a4ae13026aee
+  metadata.gz: 81586564c5621abc9ed86e17e1064e88bad114c5
+  data.tar.gz: 14ccc4f0394f4f9ef457fe17a4480db56f74b105
 SHA512:
-  metadata.gz: 227a665dd980b62df7bd070739f92d9cdb798c0000ed965998ac2a8065e83543068a5b15d88e7bdf3f0d13fae405b8216a60f92e860c019fc9027ac9cf677646
-  data.tar.gz: 1ab6a1f154230937b1ae2d94fcf2212d4339643d162d3bed6a8c1ad9df2f0788f0357c18f8d4ac07dd2bef180540a35f4d4d442c0867855948fd5c87c38c3822
+  metadata.gz: e221dd5c64b107d04762907024010a60de2b4954d26a81fac9a1392d1e4ededefc07713eb06971d6649bf0c0d11208ccdfb8339e3d965d5a4ff6e07e63cabab6
+  data.tar.gz: 4f0ad63ecb906f3162fa6373ad6fb0ec011c288616fd7fc07f38869f578503e2fccdba49b7d8634f44f1d091dd6d8b422ebe303aaec2a68d5e59bd1790b08544

data/lib/herkko/runner.rb

@@ -95,7 +95,7 @@ END
       elsif ci_state == :yellow
         Herkko.info "CI is running. Wait a while."
       else
-        Herkko.info "CI is red. Fix it!"
+        Herkko.info "CI is in unknown state. Can't continue."
       end
     end
 
@@ -126,7 +126,8 @@ END
 
     def check_ci
       Herkko.info "Checking CI..."
-      Herkko::Travis.status_for(current_branch)
+
+      travis_client.status_for(current_branch)
     end
 
     def deploy!
@@ -183,5 +184,9 @@ END
     def git_changelog
       Herkko.run("git", "log", "--pretty=format:%C(yellow)%h %Cblue%ad%Creset %an %Cgreen%s%Creset", "--date=short", "#{currently_deployed_to(environment)}..#{to_be_deployed_sha}")[0]
     end
+
+    def travis_client
+      @travis_client ||= Herkko::Travis.new
+    end
   end
 end

data/lib/herkko/travis.rb

@@ -2,27 +2,36 @@
 # travis history -l1 -bmaster
 module Herkko
   class Travis
-    def self.status_for(branch)
-      status = fetch_status(branch)
-      if status[1].length > 0
-        Herkko.info "There was an error with checking Travis: #{status[1]}"
-        :red
-      else
-        case status[0].split(":")[0]
-        when /passed/
-          :green
-        when /started/
-          :yellow
-        else
+    def status_for(branch)
+      if travis_cli_installed?
+        status = fetch_status(branch)
+        if status[1].length > 0
+          Herkko.info "There was an error with checking Travis: #{status[1]}"
           :red
+        else
+          case status[0].split(":")[0]
+          when /passed/
+            :green
+          when /started/
+            :yellow
+          else
+            :red
+          end
         end
+      else
+        Herkko.info "Travis CLI has not been installed, run: gem install travis"
+        :unknown
       end
     end
 
     private
 
-    def self.fetch_status(branch)
+    def fetch_status(branch)
       Herkko.run("travis", "history", "--skip-version-check", "-l", "1", "-b", branch)
     end
+
+    def travis_cli_installed?
+      system("which travis > /dev/null 2>&1")
+    end
   end
 end

data/lib/herkko/version.rb

@@ -1,3 +1,3 @@
 module Herkko
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herkko
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Vesa Vänskä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Herkko is a deployment tool for Heroku.