herkko 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66e289047837167cfc59ecb9f609e2b726910ec
-  data.tar.gz: c24c4ef4d171c68e92373e8143a7ad8447f25faf
+  metadata.gz: 0ad6707152df95d3628eb7ba4a27fbe51e7dc596
+  data.tar.gz: fb7b02717ca7de3d3c60da871754e0ab3a01e161
 SHA512:
-  metadata.gz: edaf3c44633f610c0b6f4225a90f101f1c62d3b72760c6215f3a2f856c1e0d650768d4271f05f2824b044a6d129da4b5d75ebe776f0c1d38713a2c4703343ed8
-  data.tar.gz: 8e06d63069e9bc33255020ccff33b51f5879f47e76b8be0932607722a74509490b431483f0a20a91ed2eeee747275307c3abaf6713bd23066606727f7ad67c31
+  metadata.gz: 73a6ecec9219fc2f4acc5302a765cb2fece32190e0b649967163c1ee95c1b908edd533eb6e850a04113edd75194792aacc3d5f28564ab652a73ae6281e97479c
+  data.tar.gz: 27d0141de48b61f0b01408de3e1573d744ebbd257ae9b5c1ad4d889488373f8a4829b8e1a282c11b412f131885dadb479ad91fdc2f8d75eaf4aed5d9a5d7f2b1

data/README.md

@@ -8,11 +8,18 @@ Install the gem with:
 
     $ gem install herkko
 
-## Usage
+## Usage & setup
+
+Herkko requires Travis gem to check the CI status:
+
+    $ gem install travis
 
 Herkko uses the git remote names to identify the applications. Usually you have production and staging.
 
-TODO: How to setup project for Herkko
+To set up Heroku remotes:
+
+    $ git remote add production https://git.heroku.com/production-app-name-at-heroku.git
+    $ git remote add staging https://git.heroku.com/staging-app-name-at-heroku.git
 
 To deploy current branch to production:
 
@@ -22,6 +29,8 @@ Running the command will check Travis CI, deploy if the build is green and runs
 
 ## Commands
 
+All commands are run `herkko [environment] [command]` like `herkko staging console`
+
 ### deploy
 
 You can add a file in `doc/after_deployment.{md, txt, rdoc, whatever}` and it
@@ -32,10 +41,26 @@ checklist like:
 * Stay alert for a while for exceptions.
 * Inform the client if it is needed (Basecamp, email, SMS...)
 
+To put application to maintenance mode while the deployment is running, use flag `--maintenance-mode`.
+
+CI check can be skipped with `--skip-ci-check`.
+
 ### console
 
 Open rails console for the application.
 
+### changelog
+
+List of commits to be deployed. Compares the current deployed version and the current local version to see what's been committed.
+
+### seed
+
+Runs seeds.rb.
+
+### migrate
+
+Only runs migrations. This is done automatically on deploy if needed.
+
 ## Contributing
 
 1. Fork it ( https://github.com/vesan/herkko/fork )

data/lib/herkko/runner.rb

@@ -45,7 +45,7 @@ module Herkko
     end
 
     def deploy
-      Herkko.info "Doing deployment to #{environment}..."
+      Herkko.info "Doing #{forced? ? "forced(!) " : ""}deployment to #{environment}..."
       fetch_currently_deployed_version
 
       Herkko.info("Deploying changes:")
@@ -99,10 +99,14 @@ module Herkko
       }
     end
 
+    def forced?
+      arguments && arguments.include?("--force")
+    end
+
     def push_new_code
-      Herkko.info "Pushing code to Heroku..."
+      Herkko.info "Pushing commit #{to_be_deployed_sha} from branch #{current_branch} to Heroku..."
       puts
-      Herkko.run_with_output("git", "push", environment, "master")
+      Herkko.run_with_output("git", "push", environment, "#{to_be_deployed_sha}:master", forced? ? "--force" : nil)
       puts
     end
 
@@ -156,10 +160,6 @@ module Herkko
       arguments && arguments.include?("--maintenance-mode")
     end
 
-    def current_branch
-      Herkko.run("git", "rev-parse", "--abbrev-ref", "HEAD")[0].strip
-    end
-
     def migrations_needed?
       file_changed?("db/migrate")
     end
@@ -168,6 +168,10 @@ module Herkko
       file_changed?("db/seeds.rb")
     end
 
+    def current_branch
+      Herkko.run("git", "rev-parse", "--abbrev-ref", "HEAD")[0].strip
+    end
+
     def currently_deployed_to(environment)
       Herkko.run("git", "rev-parse", "#{environment}/master")[0].strip
     end

data/lib/herkko/version.rb

@@ -1,3 +1,3 @@
 module Herkko
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herkko
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Vesa Vänskä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler