herkko 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4bb15ce4a18b2b70474f690c32c80b1cb87c65
-  data.tar.gz: bd4c100155073319adb3ad66cccbda4c26b783b1
+  metadata.gz: dbf0c54b591fdc987afc4f25d41056e58b52cfa3
+  data.tar.gz: 1c9186aa1f643505e66a9f1214cb42e4985d7517
 SHA512:
-  metadata.gz: 73e74592872f6fb34f67d45a66dce243f589409939754444c84872e475dfa1318c21f3a97eff5412fedfff216e3ad004b70a35991c31f906cca076ddcbc1f0fe
-  data.tar.gz: cb20b53b32ed8db219aee0cf7768f9035c095c7d5e34231cb93f8997aa0fcdf39be18ce048df97b5c44256e67fca4bc6d7e223d21b5d9842b992e724ad2337e8
+  metadata.gz: ba4ba588eefdf5b39271c610d48a2c282747c8f15c6f47e4f649b92cb192764a55a7ab79783e4d228e5d9e8ab41dc0db871ceb5ab094e96d4ef50f98d180bb47
+  data.tar.gz: bb2c0389b83532c3361789eff1e27958c9a8e875ebae4db6cff8818e139d84634cf06669724fafaf54c0aeec7aae322719e7a1a1a1506d0466688e335281b36a

data/lib/herkko/runner.rb

@@ -15,7 +15,11 @@ module Herkko
 
     def run
       if ["version", "--version"].include?(environment)
-        return version
+        return print_version
+      end
+
+      if ["help", "--help"].include?(environment)
+        return print_usage
       end
 
       return print_usage if environment.nil? || command.nil?
@@ -27,15 +31,34 @@ module Herkko
       end
     end
 
-    def version
+    def print_version
       Herkko.puts "Herkko #{Herkko::VERSION}"
     end
 
     def print_usage
       Herkko.puts <<END
-Herkko
+# Herkko
+
+Run `herkko [remote name] [command]` for example `herkko production deploy`.
+
+There are special commands like `deploy` is a special command that does extra checks. Other commands 
+are just proxied to the heroku CLI tool (for example `herkko production logs`).
+
+## Naming remotes
+
+It's recommended to name your remotes for example production & staging. Then you can always just type `herkko production deploy` to release a new version.
+
+## Commands
+
+console | Opens Rails console
+deploy  | Deploys new version
+seed    | Runs seeds.rb
+migrate | Run migrations and restarts the app
+
+### deploy
+
+--skip-ci-check - Skips the Travis CI build status check
 
-Run `herkko [environment] [command]` for example `herkko production deploy`.
 END
     end
 
@@ -78,11 +101,6 @@ END
       Herkko.run_with_output "heroku run rake db:seed -r #{environment}"
     end
 
-    def check_ci
-      Herkko.info "Checking CI..."
-      Herkko::Travis.status_for(current_branch)
-    end
-
     def migrate
       Herkko.info "Migrating database..."
       Herkko.run_with_output %{
@@ -100,6 +118,11 @@ END
 
     private
 
+    def check_ci
+      Herkko.info "Checking CI..."
+      Herkko::Travis.status_for(current_branch)
+    end
+
     def deploy!
       run_migrations = migrations_needed?
       push_new_code

data/lib/herkko/travis.rb

@@ -22,7 +22,7 @@ module Herkko
     private
 
     def self.fetch_status(branch)
-      Herkko.run("travis", "history", "-l", "1", "-b", branch)
+      Herkko.run("travis", "history", "--skip-version-check", "-l", "1", "-b", branch)
     end
   end
 end

data/lib/herkko/version.rb

@@ -1,3 +1,3 @@
 module Herkko
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herkko
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Vesa Vänskä