ora-cli 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45f1c3607059b4090480dfdfb27bef6542a7cbf
-  data.tar.gz: 94f4f9e306a9836086863e142593bcdf31b92399
+  metadata.gz: f5a16980ec4decffb7553e61174d6accaf4d03a0
+  data.tar.gz: 93b52167a75ade9e723ec2104c39cafa3fbe2e13
 SHA512:
-  metadata.gz: 0d3d333b86936299e5da26c9660f753580b960c553af976713aabdf7b8a61f145a2b2e80e62774181ac8407dd70794c6768876a11e559a84ab90fe8cfecade09
-  data.tar.gz: 4c8901a6acfa2ad35c76e55f3c5ee147a0541710e4c74a595aced21992e13c0576763fecfba2a78e8190ae2707ffe45dc14aa0373db29e6b05fcd4f296badfb5
+  metadata.gz: 93d7c97aa498f86bfc5fe0885e89c43788e8ba89a4acfe83824cd8bd0a4d607dc98c0e2491f505b659a34a1a683754e9833a93d452e3d384ef8b27bc24264001
+  data.tar.gz: 853a503f7e487bdcc7c4e1841f95972e64c4ef15fdb6387bbf777f4a1f7e5135633ab37a358aa88cda9e73efb48abed354d4f89f778acf83bcc356c66d48acc6

data/bin/ora

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'ora/cli'
 

data/lib/ora/cli/bash.rb

@@ -3,11 +3,14 @@ require "ora/cli/path"
 
 module Ora::Cli
   class Bash
+    attr_reader :unprocessed_commands
+
     def initialize(target, from: nil, print: Print.new)
-      @target  = target
-      @from    = from
-      @print   = print
-      @success = true
+      @target               = target
+      @from                 = from
+      @print                = print
+      @success              = true
+      @unprocessed_commands = []
     end
 
     def silent command
@@ -16,17 +19,24 @@ module Ora::Cli
 
     def run commands
       @success = true
-      unprocessed_commands = extract commands
+      @unprocessed_commands = extract commands
 
       outputs = []
-      while (command = complete unprocessed_commands.shift)
+      command = ''
+      while (command = complete @unprocessed_commands.shift)
         next if command.empty?
-        break unless call command do |output|
+
+        if method? command
+          sub_commands = call_method command
+          @unprocessed_commands.unshift(*extract(sub_commands))
+        else
+          @success, output = shell command
           outputs.push output
+          break unless @success
         end
       end
 
-      handle_failed unprocessed_commands
+      @unprocessed_commands.unshift(command) unless @success
 
       join outputs
     end
@@ -54,8 +64,8 @@ module Ora::Cli
       outputs.compact.map(&:strip).reject(&:empty?).join("\n")
     end
 
-    def call_target method_name
-      @target.method(method_name).call
+    def call_target method_name, args = []
+      @target.method(method_name).call(*args)
     end
 
     def complete unprocessed_command
@@ -66,45 +76,28 @@ module Ora::Cli
       end
     end
 
-    def call command
+    def shell command
       @print.green command
 
-      @success =
-        if method? command
-          call_method command
-        else
-          yield(shell command)
-          $?.success?
-        end
+      output  = @print.plain `#{move}#{command}#{capture_err}`
+      success = $?.success?
 
-      alert command unless @success
-      @success
+      show_failed_message unless success
+
+      [success, output]
     end
     def method? command
       command.start_with? ":"
     end
-    def method_name command
-      command.sub(':', '')
-    end
     def call_method command
-       success_call? call_target(method_name command)
-    end
-    def success_call? method_return
-      method_return != false
-    end
-    def shell command
-      @print.plain `#{move}#{command}#{capture_err}`
-    end
-
-    def alert command
-      @print.red "\nProcess Failed! Please resolve the issue above and run commands below manually\n"
-      @print.red command
+      list   = command.split
+      method = list.shift.sub(':', '')
+      args   = list.join.split(',').map(&:strip)
+      call_target(method, args)
     end
 
-    def handle_failed unprocessed_commands
-      unprocessed_commands.each do |unprocessed_command|
-        @print.red(complete unprocessed_command)
-      end
+    def show_failed_message
+      @print.red "\nProcess Failed! Please resolve the issue above and run 'ora' again to continue\n"
     end
 
   end

data/lib/ora/cli/precondition_error.rb

@@ -0,0 +1,4 @@
+module Ora::Cli
+  class PreconditionError < StandardError
+  end
+end

data/lib/ora/cli/push_task.rb

@@ -0,0 +1,34 @@
+require 'ora/cli/task'
+
+module Ora::Cli
+  class PushTask < Task
+
+    def commands
+      '
+      :feature_branch!
+      :clean_branch!
+      :pull_branch
+      git checkout develop
+      git pull origin develop
+      git checkout #{branch}
+      git merge develop
+      git checkout #{target}
+      git pull origin #{target}
+      git merge #{branch}
+      git push origin #{target}
+      git checkout #{branch}
+      :slack_message_to_paste
+      '
+    end
+
+    private
+    def slack_message_to_paste
+      print.plain ":merge: #{branch} => #{target}\n:monorail: #{target}"
+      ''
+    end
+
+    def target
+      self.class.name.match(/PushTo(.*)/)[1].downcase
+    end
+  end
+end

data/lib/ora/cli/task.rb

@@ -1,12 +1,15 @@
 require "ora/cli/bash"
 require "ora/cli/print"
 require "ora/cli/stdin"
+require 'ora/cli/precondition_error'
+require "json"
 
 module Ora::Cli
   class Task
     attr_reader :branch, :stdin, :print
 
-    MAIN_BRANCHES = %w{master develop staging uat}
+    DEVELOP_BRANCH = 'develop'
+    CONTINUE_FILE  = '~/.ora_continue'
 
     def initialize(from, inputs: [], print: Print.new)
       @from   = from
@@ -18,10 +21,36 @@ module Ora::Cli
 
     def run
       @bash.run commands
+      save_on_fail
+    rescue PreconditionError => e
+      @print.red("Precondition not met!\n#{e.message}")
+    end
+
+    def continue(info)
+      @print.green("Continue task - #{info['task']}\n")
+      set_variables(info['variables'])
+      @bash.run info['commands']
+      save_on_fail
+      File.delete(File.expand_path(CONTINUE_FILE)) if @bash.success?
+    end
+
+    def variables
+      instance_variables.inject({}) do |hash, attribute|
+        value = instance_variable_get(attribute)
+        if value.to_s.start_with? '#<'
+          hash
+        else
+          hash.merge!(attribute.to_s.sub('@', '') => value)
+        end
+      end
+    end
+
+    def set_variables data
+      data.each { |k, v| instance_variable_set("@#{k}", v) }
     end
 
     def commands
-      raise "Override this method in subclass"
+      raise PreconditionError, "Override this method in subclass."
     end
 
     def success?
@@ -34,24 +63,64 @@ module Ora::Cli
     end
 
     def main_branch?
-      MAIN_BRANCHES.include? branch
+      main_branches.include? branch
+    end
+
+    def main_branches
+      [DEVELOP_BRANCH] +
+      Dir.entries(Path.tasks).
+        map {|name| name.match(/push_to_(.*)\.rb/)}.compact.
+        map {|match| match[1]}
     end
 
     def feature_branch!
       if main_branch?
-        @print.red "Please checkout feature branch first!"
-        false
+        raise PreconditionError, "Please checkout feature branch first."
       end
+      ''
     end
 
     def clean_branch!
       if dirty?
-        print.red "Please clean the feature branch '#{branch}'!"
-        return false
+        raise PreconditionError,
+          "Please clean the feature branch '#{branch}'."
       end
+      ''
     end
     def dirty?
       !@bash.silent('git status').include? 'nothing to commit'
     end
+
+    def pull_branch
+      return '' unless remote_branch?
+
+      "git pull origin #{branch}"
+    end
+    def remote_branch?
+      !@bash.silent("git branch -a | grep remotes/origin/#{branch}$").empty?
+    end
+
+    def save_on_fail
+      return if @bash.success?
+
+      text = JSON.generate(
+        'task'      => underscore(self.class.name.split(':').last),
+        'variables' => variables,
+        'commands'  => @bash.unprocessed_commands.join("\n")
+      )
+      File.write(File.expand_path(CONTINUE_FILE), text)
+    end
+
+    # File activesupport/lib/active_support/inflector/methods.rb
+    def underscore(camel_cased_word)
+      return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
+      word = camel_cased_word.to_s.gsub('::'.freeze, '/'.freeze)
+      # word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1 && '_'.freeze }#{$2.downcase}" }
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
+      word.tr!("-".freeze, "_".freeze)
+      word.downcase!
+      word
+    end
   end
 end

data/lib/ora/cli/tasks/new_feature_branch.rb

@@ -18,6 +18,7 @@ module Ora::Cli
     def set_branch_name
       print.inline 'Type new branch name: '
       @branch_name = stdin.gets(/^[a-zA-Z0-9\/_-]+$/)
+      ''
     end
   end
 end

data/lib/ora/cli/tasks/push_feature_branch.rb

@@ -6,6 +6,7 @@ module Ora::Cli
       '
       :feature_branch!
       :clean_branch!
+      :pull_branch
       git checkout develop
       git pull origin develop
       git checkout #{branch}

data/lib/ora/cli/tasks/push_to_aus.rb

@@ -0,0 +1,6 @@
+require 'ora/cli/push_task'
+
+module Ora::Cli
+  class PushToAus < PushTask
+  end
+end

data/lib/ora/cli/tasks/push_to_master.rb

@@ -8,6 +8,7 @@ module Ora::Cli
       '
       :feature_branch!
       :clean_branch!
+      :pull_branch
       git checkout develop
       git pull origin develop
       git merge #{branch}
@@ -33,6 +34,7 @@ module Ora::Cli
       print.inline "New Version: "
       @version = stdin.gets(/^(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)?$/)
       @version = recommend_version if @version.empty?
+      ''
     end
     def latest_versions
       @latest_versions ||=
@@ -48,6 +50,7 @@ module Ora::Cli
 
     def slack_message_to_paste
       print.plain ":merge: #{branch} => develop\n:merge: develop => master\n:monorail: production"
+      ''
     end
   end
 end

data/lib/ora/cli/tasks/push_to_staging.rb

@@ -1,28 +1,6 @@
-require 'ora/cli/task'
+require 'ora/cli/push_task'
 
 module Ora::Cli
-  class PushToStaging < Task
-
-    def commands
-      '
-      :feature_branch!
-      :clean_branch!
-      git checkout develop
-      git pull origin develop
-      git checkout #{branch}
-      git merge develop
-      git checkout staging
-      git pull origin staging
-      git merge #{branch}
-      git push origin staging
-      git checkout #{branch}
-      :slack_message_to_paste
-      '
-    end
-
-    private
-    def slack_message_to_paste
-      print.plain ":merge: #{branch} => staging\n:monorail: staging"
-    end
+  class PushToStaging < PushTask
   end
 end

data/lib/ora/cli/tasks/push_to_uat.rb

@@ -1,28 +1,6 @@
-require 'ora/cli/task'
+require 'ora/cli/push_task'
 
 module Ora::Cli
-  class PushToUat < Task
-
-    def commands
-      '
-      :feature_branch!
-      :clean_branch!
-      git checkout develop
-      git pull origin develop
-      git checkout #{branch}
-      git merge develop
-      git checkout uat
-      git pull origin uat
-      git merge #{branch}
-      git push origin uat
-      git checkout #{branch}
-      :slack_message_to_paste
-      '
-    end
-
-    private
-    def slack_message_to_paste
-      print.plain ":merge: #{branch} => uat\n:monorail: uat"
-    end
+  class PushToUat < PushTask
   end
 end

data/lib/ora/cli/tasks/switch_branch.rb

@@ -1,4 +1,5 @@
 require 'ora/cli/task'
+require 'ora/cli/precondition_error'
 
 module Ora::Cli
   class SwitchBranch < Task
@@ -10,24 +11,26 @@ module Ora::Cli
       :switch_to
       git stash save -u "OraCli"
       git checkout #{target_branch}
-      #{apply_stash}
+      :apply_stash
       '
     end
 
     private
     def only_feature_branch_can_be_dirty!
       if main_branch? && dirty?
-        print.red "#{branch} branch can't be dirty!"
-        return false
+        raise PreconditionError, "#{branch} branch can't be dirty."
       end
+      ''
     end
 
     def switch_to
       @target_branch = stdin.select("git branch | grep '^  ' | sed 's/^  //'")
+      ''
     end
 
     def apply_stash
-      return nil if target_stash_revision.empty?
+      return '' if target_stash_revision.empty?
+
       "git stash pop #{target_stash_revision}"
     end
     def target_stash_revision

data/lib/ora/cli/version.rb

@@ -1,5 +1,5 @@
 module Ora
   module Cli
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/ora/cli.rb

@@ -1,6 +1,7 @@
 require "ora/cli/version"
 require "ora/cli/bash"
 require "ora/cli/path"
+require "ora/cli/task"
 
 module Ora
   module Cli
@@ -8,6 +9,20 @@ module Ora
       project_path = `pwd`.strip
       remove_ext   = "sed 's/\.[^.]*$//'"
 
+      unless `cat #{Task::CONTINUE_FILE}`.empty?
+        continue = JSON.parse(File.read(File.expand_path(Task::CONTINUE_FILE)))
+
+        task = continue['task']
+        require "ora/cli/tasks/#{task}"
+
+        class_name = task.split('_').map(&:capitalize).join
+        Object.const_get("Ora::Cli::#{class_name}").
+          new(project_path).
+          continue(continue)
+
+        return
+      end
+
       task = Bash.new(project_path).select("ls #{Path.tasks} | #{remove_ext}")
 
       require "ora/cli/tasks/#{task}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ora-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ducksan Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,11 +75,14 @@ files:
 - lib/ora/cli.rb
 - lib/ora/cli/bash.rb
 - lib/ora/cli/path.rb
+- lib/ora/cli/precondition_error.rb
 - lib/ora/cli/print.rb
+- lib/ora/cli/push_task.rb
 - lib/ora/cli/stdin.rb
 - lib/ora/cli/task.rb
 - lib/ora/cli/tasks/new_feature_branch.rb
 - lib/ora/cli/tasks/push_feature_branch.rb
+- lib/ora/cli/tasks/push_to_aus.rb
 - lib/ora/cli/tasks/push_to_master.rb
 - lib/ora/cli/tasks/push_to_staging.rb
 - lib/ora/cli/tasks/push_to_uat.rb