herkko 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879673de11ce7eb529e4356895103ed89a184a13
-  data.tar.gz: fc9394e4eb03e2e4e339d28951dc4445f775c54c
+  metadata.gz: 38ce9fb0c1c0bcf36cd9ee05a9992adfa8ef0177
+  data.tar.gz: d383b1fc91c655ff8476fac4902e3b362ad711a8
 SHA512:
-  metadata.gz: 48b3fb77e95574d6ae9bb71968740eb895c9aaf6a548407d6ecf1c430a6ba76449f47112ffc1657787c3e4673674b84004d36f0b4cfc2f409d85f873719bdc4d
-  data.tar.gz: 2154638e81b8eccb4bfe9a15cc0ef6038e2dda666cb417ea9effedf36611594d36111a368511b8860f0e30ed613ab83ba56c244fc05bbedd432ece18f4124597
+  metadata.gz: f79acc52f47187e90833c81e564de33572385b5894b5fa38fd32ea828ece01c8dd6376f491b0e6f84c474987e7687bf96fd0c3df826394a12aa5854638f569cf
+  data.tar.gz: 67eaf3b8a15d9688b0057112dd539d5fcef39fc5afc580cb0f33840105f83eab18b13b931b22f4728283bf25621739fb4b9672a29eda5df183130f2e4aff5b5c

data/lib/herkko/runner.rb

@@ -14,17 +14,29 @@ module Herkko
     end
 
     def run
+      if ["version", "--version"].include?(environment)
+        return version
+      end
+
       return print_usage if environment.nil? || command.nil?
 
       if respond_to?(command)
-        send(command, *arguments)
+        send(command)
       else
-        Herkko.run_and_puts("heroku", arguments + ["-r#{environment}"])
+        Herkko.run_with_output("heroku", arguments + ["-r#{environment}"])
       end
     end
 
+    def version
+      Herkko.puts "Herkko #{Herkko::VERSION}"
+    end
+
     def print_usage
-      Herkko.info "TODO: Usage instructions"
+      Herkko.puts <<END
+Herkko
+
+Run `herkko [environment] [command]` for example `herkko production deploy`.
+END
     end
 
     def deploy
@@ -33,30 +45,39 @@ module Herkko
 
       Herkko.info("Deploying changes:")
 
+      puts
       puts changelog
+      puts
 
-      if check_ci == :green
-        Herkko.info "CI is green. Deploying..."
-
-        run_migrations = migrations_needed?
-        push_new_code
+      ci_state = if skip_ci_check?
+        :skip
+      else
+        check_ci
+      end
 
-        if run_migrations
-          migrate
-        else
-          Herkko.info "No need to migrate."
-        end
+      if ci_state == :green
+        Herkko.info "CI is green. Deploying..."
 
-        if seed_file_changed?
-          Herkko.info "NOTE: Seed file seem the have changed. Make sure to run it if needed."
-        end
+        deploy!
+      elsif ci_state == :skip
+        Herkko.info "Skipping CI. Deploying..."
 
-        # TODO: puts "Print the after deployment checklist from a file"
+        deploy!
+      elsif ci_state == :yellow
+        Herkko.info "CI is running. Wait a while."
       else
         Herkko.info "CI is red. Fix it!"
       end
     end
 
+    def console
+      Herkko.run_with_output "heroku run rails console -r #{environment}"
+    end
+
+    def seed
+      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)
@@ -64,7 +85,7 @@ module Herkko
 
     def migrate
       Herkko.info "Migrating database..."
-      Herkko.run_and_puts %{
+      Herkko.run_with_output %{
         heroku run rake db:migrate -r #{environment} &&
         heroku restart -r #{environment}
       }
@@ -72,11 +93,34 @@ module Herkko
 
     def push_new_code
       Herkko.info "Pushing code to Heroku..."
-      Herkko.run_and_puts("git", "push", environment)
+      puts
+      Herkko.run_with_output("git", "push", environment, "master")
+      puts
     end
 
     private
 
+    def deploy!
+      run_migrations = migrations_needed?
+      push_new_code
+
+      if run_migrations
+        migrate
+      else
+        Herkko.info "No need to migrate."
+      end
+
+      if seed_file_changed?
+        Herkko.info "NOTE: Seed file seem the have changed. Make sure to run it if needed."
+      end
+
+      # TODO: puts "Print the after deployment checklist from a file"
+    end
+
+    def skip_ci_check?
+      arguments.include?("--skip-ci-check")
+    end
+
     def current_branch
       Herkko.run("git", "rev-parse", "--abbrev-ref", "HEAD")[0].strip
     end
@@ -100,15 +144,15 @@ module Herkko
     def file_changed?(file_path)
       files = Herkko.run("git", "diff", "--name-only", currently_deployed_to(environment), to_be_deployed_sha)[0]
 
-      files.split("\n").any? {|filename| filename.match(Regex.new(file_path)) }
+      files.split("\n").any? {|filename| filename.match(Regexp.new(file_path)) }
     end
 
     def fetch_currently_deployed_version
-      Herkko.run_and_puts("git", "fetch", environment)
+      Herkko.run_with_output("git", "fetch", environment)
     end
 
     def changelog
-      Herkko.run("git", "log", "--name-only", "#{currently_deployed_to(environment)}..#{to_be_deployed_sha}")[0]
+      Herkko.run("git", "log", "--pretty=short", "#{currently_deployed_to(environment)}..#{to_be_deployed_sha}")[0]
     end
   end
 end

data/lib/herkko/travis.rb

@@ -8,8 +8,11 @@ module Herkko
         Herkko.info "There was an error with checking Travis: #{status[1]}"
         :red
       else
-        if status[0].match(/passed/)
+        case status[0].split(":")[0]
+        when /passed/
           :green
+        when /started/
+          :yellow
         else
           :red
         end

data/lib/herkko/version.rb

@@ -1,3 +1,3 @@
 module Herkko
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/herkko.rb

@@ -5,20 +5,24 @@ module Herkko
   @@debug = false
 
   def self.info(text)
-    puts "-> " + text
+    Kernel.puts "-> " + text
+  end
+
+  def self.puts(text)
+    Kernel.puts text
   end
 
   def self.run(*command)
     if @@debug
-      puts "--> #{command.join(" ")}"
+      Kernel.puts "--> #{command.join(" ")}"
     end
 
     Open3.capture3(*command)
   end
 
-  def self.run_and_puts(*command)
+  def self.run_with_output(*command)
     if @@debug
-      puts "--> #{command.join(" ")}"
+      Kernel.puts "--> #{command.join(" ")}"
     end
 
     Kernel.system(*command)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herkko
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vesa Vänskä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2016-08-16 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.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Herkko is a deployment tool for Heroku.