hanzo 0.6.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3fdfe4074e2f695d32dea1ced3d9543437063c2
-  data.tar.gz: 364e464b762238cc38edb434325ec5f2a5becb6e
+  metadata.gz: bee1eec974365dfa0ec1f64e66e815bf1fdc12cf
+  data.tar.gz: 7f6232230bb005fd4d839e76f627cc1a25db4873
 SHA512:
-  metadata.gz: 4eb468e8e684e30e2cb56e589f1577aea1c1981a904d57a77193238585b5013a70452e40bcab2ba321f50aa795e8691831696b3e74c2cf6a54a88adaf67b5c06
-  data.tar.gz: 94f54a5a792360c4e580a879e0fb0075958b1cda8d25113beda95188438c59753a73456c37dd477cd09ebf3f74cd948e5b789f7b4dd4518f90b9eca9e966cdb2
+  metadata.gz: c0666923ca775c15f98f3fba16b86ca679459c8a68319420e5caada843ee16d409e4d8d41b5d264cfa3c101fcd363f64720ec06a7f73d82996506a4e22642bd3
+  data.tar.gz: 989a4281de8b8ec204ff0e767dd894ea43c80d429bd6f53ca6655d97057959cb7fc6d6ed96216a09d21ae5f4e1d69f88999b5a5f132ccfb9fdda8436bebc85bd

data/.rubocop.yml

@@ -4,6 +4,9 @@ Documentation:
 Encoding:
   Enabled: false
 
+BlockLength:
+  Max: 100
+
 LineLength:
   Max: 200
 
@@ -17,7 +20,7 @@ IfUnlessModifier:
   Enabled: false
 
 CaseIndentation:
-  IndentWhenRelativeTo: case
+  EnforcedStyle: case
   IndentOneStep: true
 
 MethodLength:
@@ -56,3 +59,7 @@ DoubleNegation:
 
 TrivialAccessors:
   ExactNameMatch: true
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%w':    '()'

data/README.md

@@ -3,10 +3,9 @@
     <img src="http://i.imgur.com/RZbJy1u.png" alt="Hanzo" />
   </a>
   <br />
-  Hanzo is a sharp tool to handle deployments of multiple environments of the same application on Heroku.
+  Hanzo is a sharp tool to handle deploying an application on Heroku on multiple environments.
   <br /><br />
   <a href="https://rubygems.org/gems/hanzo"><img src="http://img.shields.io/gem/v/hanzo.svg" /></a>
-  <a href="https://codeclimate.com/github/mirego/hanzo"><img src="http://img.shields.io/codeclimate/github/mirego/hanzo.svg" /></a>
   <a href='https://gemnasium.com/mirego/hanzo'><img src="http://img.shields.io/gemnasium/mirego/hanzo.svg" /></a>
   <a href="https://travis-ci.org/mirego/hanzo"><img src="http://img.shields.io/travis/mirego/hanzo.svg" /></a>
 </p>
@@ -23,30 +22,35 @@ gem 'hanzo'
 
 ## Usage
 
-Create an `.hanzo.yml` file at the root of your app that will contain a map of
+Create a `.hanzo.yml` file at the root of your app that will contain a map of
 remotes, with the remote as the key and the Heroku application name as the value.
 
-You can also specify commands that can be ran on the application after a
-successful deploy. Hanzo will prompt to run each of them, they each will be ran
-with `heroku run` and the application will be restarted at the end.
+You can also use `after_deploy` to specify commands that will be run on the application
+after a successful deployment. Hanzo will prompt you before running each command,
+then use `heroku run` to execute it. The application is restarted afterwards.
 
 ```yaml
 remotes:
   qa: heroku-app-name-qa
   staging: heroku-app-name-staging
   production: heroku-app-name-production
+
 after_deploy:
   - rake db:migrate
 ```
 
-### Install remotes
+### `hanzo install`
+
+#### Remotes
 
-Whenever you add a new remote to your `.hanzo.yml` file, you'll have to install those
-remotes locally by running `hanzo install`.
+Whenever you add new remotes to your `.hanzo.yml` file, you'll have to install
+them locally by running `hanzo install remotes`.
 
 ```bash
-> hanzo install
+$ hanzo install remotes
+```
 
+```
 -----> Creating git remotes
        Adding qa
         git remote rm qa 2>&1 > /dev/null
@@ -59,22 +63,16 @@ remotes locally by running `hanzo install`.
         git remote add production git@heroku.com:heroku-app-name-production.git
 ```
 
-### Deploy a branch or a tag
+#### Labs
 
-```bash
-> hanzo deploy qa
-
------> Branch to deploy: |HEAD|
-```
-
-### Install labs
-
-Once all your remotes are installed, you might want to enable some
-Heroku labs feature for all of them.
+Once all your remotes are installed, you might want to enable Heroku labs
+features:
 
 ```bash
-> bundle exec hanzo install labs
+$ hanzo install labs
+```
 
+```
 -----> Activating Heroku Labs
        Add preboot? yes
        - Enabled for qa
@@ -86,12 +84,101 @@ Heroku labs feature for all of them.
        - Enabled for production
 ```
 
+### `hanzo deploy`
+
+You can deploy to a specific remote using `hanzo deploy <remote>` and an
+optional reference to deploy. If no reference is specified, Hanzo will prompt
+for one (with `HEAD` as the default value).
+
+```bash
+$ hanzo deploy qa release/qa
+```
+
+```
+       git push -f qa release/qa:master
+
+       …
+
+remote: Verifying deploy... done.
+To heroku.com:heroku-app-name-qa.git
+   550c719..27e3538  release/qa -> master
+
+       Run `rake db:migrate` on qa? y
+       heroku run rake db:migrate --remote qa
+
+Running rake db:migrate on heroku-app-name-qa...
+15:45:26.380 [info] Already up
+       heroku ps:restart --remote qa
+
+Restarting dynos on heroku-app-name-qa...
+```
+
+### `hanzo diff`
+
+You can use `hanzo diff <remote>` to compare the current repository state to the code
+that is currently deployed in the specified remote.
+
+Warning: This uses Heroku’s git repository references so its output might be
+wrong if the application was rollbacked.
+
+```
+$ hanzo diff qa
+       git remote update qa && git diff qa/master...HEAD
+```
+
+```diff
+────────────────────────────────────────────────────────────────────────────────────────────
+ -- a/lib/my_app/router.ex
+ ++ b/lib/my_app/router.ex
+────────────────────────────────────────────────────────────────────────────────────────────
+@@ -30,6 +30,8 @@ defmodule MyApp.Router do
+    plug(:fetch_flash)
++   plug(:protect_from_forgery)
++   plug(:put_secure_browser_headers)
+```
+
+### `hanzo config`
+
+#### Compare
+
+You can use `hanzo config compare` to find out which environment variables are
+present in only some of your environments.
+
+```
+$ hanzo config compare
+```
+
+```
+-----> Fetching environment variables
+       heroku config -r qa
+       heroku config -r staging
+       heroku config -r production
+
+-----> Comparing environment variables
+       Missing variables in qa
+       - ASSET_HOST
+       Missing variables in staging
+       - SMTP_PASSWORD
+       - SMTP_PORT
+       - SMTP_SERVER
+       - SMTP_USER
+       Missing variables in production
+       - SMTP_PASSWORD
+       - SMTP_PORT
+       - SMTP_SERVER
+       - SMTP_USER
+```
+
 ## License
 
-`Hanzo` is © 2013-2017 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/hanzo/blob/master/LICENSE.md) file.
+`Hanzo` is © 2013-2018 [Mirego](http://www.mirego.com) and may be freely
+distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the
+[`LICENSE.md`](https://github.com/mirego/hanzo/blob/master/LICENSE.md) file.
 
 ## About Mirego
 
-[Mirego](http://mirego.com) is a team of passionate people who believe that work is a place where you can innovate and have fun. We're a team of [talented people](http://life.mirego.com) who imagine and build beautiful Web and mobile applications. We come together to share ideas and [change the world](http://mirego.org).
+[Mirego](https://www.mirego.com) is a team of passionate people who believe that
+work is a place where you can innovate and have fun. We're a team of [talented people](https://life.mirego.com)
+who imagine and build beautiful Web and mobile applications. We come together to share ideas and [change the world](http://mirego.org).
 
-We also [love open-source software](http://open.mirego.com) and we try to give back to the community as much as we can.
+We also [love open-source software](https://open.mirego.com) and we try to give back to the community as much as we can.

data/bin/hanzo

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w(.. lib))
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'hanzo'
 

data/hanzo.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'phare', '~> 0.6'
-  spec.add_development_dependency 'rubocop', '~> 0.24'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'rubocop', '~> 0.49'
 
   spec.add_dependency 'highline', '>= 1.6.19'
 end

data/lib/hanzo.rb

@@ -15,11 +15,11 @@ module Hanzo
     output = true
 
     _run do
-      if fetch_output
-        output = `#{command}`
-      else
-        output = system(command)
-      end
+      output = if fetch_output
+                 `#{command}`
+               else
+                 system(command)
+               end
     end
 
     output
@@ -68,6 +68,6 @@ end
 
 class String
   def unindent
-    gsub(/^#{scan(/^\s*/).min_by { |l| l.length }}/, '')
+    gsub(/^#{scan(/^\s*/).min_by(&:length)}/, '')
   end
 end

data/lib/hanzo/modules/config.rb

@@ -52,7 +52,7 @@ module Hanzo
       @variables.each_pair do |env, variables|
         missing_variables = all_variables - variables
         Hanzo.print "Missing variables in #{env}", :yellow
-        Hanzo.print missing_variables.map { |v| "- #{v}" }
+        Hanzo.print(missing_variables.map { |v| "- #{v}" })
       end
     end
   end

data/lib/hanzo/modules/deploy.rb

@@ -18,7 +18,7 @@ module Hanzo
       deploy && run_after_deploy_commands
     rescue UnknownEnvironment
       Hanzo.unindent_print "Environment `#{@env}` doesn't exist. Add it to .hanzo.yml and run:\n  hanzo install remotes", :red
-      Hanzo.unindent_print "\nFor more information, read https://github.com/mirego/hanzo#install-remotes", :red
+      Hanzo.unindent_print "\nFor more information, read https://github.com/mirego/hanzo#remotes", :red
     rescue UninstalledEnvironment
       Hanzo.unindent_print "Environment `#{@env}` has been found in your .hanzo.yml file. Before using it, you must install it:\n  hanzo install remotes", :red
     end

data/lib/hanzo/modules/install.rb

@@ -18,7 +18,7 @@ module Hanzo
 
       method = "install_#{@type}"
 
-      if self.respond_to?(method)
+      if respond_to?(method)
         send(method)
       else
         initialize_help

data/lib/hanzo/modules/installers/labs.rb

@@ -4,7 +4,7 @@ module Hanzo
       def install_labs
         Hanzo.title('Activating Heroku Labs')
 
-        Hanzo::Heroku.available_labs.each do |name, _|
+        Hanzo::Heroku.available_labs.each_key do |name|
           next unless Hanzo.agree("Add #{name}?")
 
           Hanzo::Installers::Remotes.environments.each_pair do |env, _|

data/lib/hanzo/version.rb

@@ -1,3 +1,3 @@
 module Hanzo
-  VERSION = '0.6.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/cli/deploy_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Hanzo::CLI do
   describe :deploy do
-    let(:deploy!) { Hanzo::CLI.new(['deploy', 'production']) }
+    let(:deploy!) { Hanzo::CLI.new(%w(deploy production)) }
     let(:deploy_question) { 'Branch to deploy in production:' }
-    let(:deploy_command) { "git push -f production 1.0.0:master" }
+    let(:deploy_command) { 'git push -f production 1.0.0:master' }
 
     before do
       expect(Hanzo::Installers::Remotes).to receive(:environments).and_return(['production'])
@@ -12,8 +12,8 @@ describe Hanzo::CLI do
     end
 
     context 'deploy with specific branch' do
-      let(:deploy!) { Hanzo::CLI.new(['deploy', 'production', '2.0.0']) }
-      let(:deploy_command) { "git push -f production 2.0.0:master" }
+      let(:deploy!) { Hanzo::CLI.new(%w(deploy production 2.0.0)) }
+      let(:deploy_command) { 'git push -f production 2.0.0:master' }
       let(:deploy_result) { true }
       let(:config) { {} }
 

data/spec/cli/install_spec.rb

@@ -18,10 +18,10 @@ describe Hanzo::CLI do
         expect(Hanzo::Heroku).to receive(:available_labs).and_return(available_labs)
         expect(Hanzo).to receive(:title).with(labs_title)
 
-        available_labs.each do |name, _|
+        available_labs.each_key do |name|
           expect(Hanzo).to receive(:agree).with("Add #{name}?").and_return(true)
 
-          heroku_remotes.each do |env, _|
+          heroku_remotes.each_key do |env|
             expect(Hanzo).to receive(:run).with("#{enable_labs_cmd} #{name} --remote #{env}")
             expect(Hanzo).to receive(:print).with("#{enable_labs_info} #{env}")
           end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w(.. lib))
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'hanzo'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanzo
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Garneau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement