ora-cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ffb993c92edbd65650f38d40babfaaf6b4dbb9
-  data.tar.gz: a52806ca086055d8f89111ecb1eb825467855abc
+  metadata.gz: e6baf3c45bb5e052285bc2c476902b4a329f533f
+  data.tar.gz: dee459f8cf75961b8a9a4828109a18fe342e1dba
 SHA512:
-  metadata.gz: 3e7775607b46f76a481da64b6ba2ad446438655f2f8d705df62c997af9d4268ade3f2d8306447ae8a310eee1e3d1a283bbb5c6a2549d01c94bfe6206042aa9e3
-  data.tar.gz: 6b6e4ad0073c0df80048f68bef4b599f6a8b61ffdfb51617fa056c861645218d583a213c444a6e7a1a6ae1aed50d9c1079f654645cab4762bd108de62a614bce
+  metadata.gz: cf4e37a5f7c2ac3b45a3fc75b390f082abfed1a01c596c9abd37ff57c375eedc8a88816c4a9a95809e106bc249b07c82c865276f9f1540c2d30ed2643df1f5cc
+  data.tar.gz: d4c640b7fdc6418310b2e3d9d10e01ef90044596e8b8cc85ae33815c83e58e7b37df505d0c2d20ab57acb1326123e50c2bc9ccb1eae5a325ac84babfd5bfb784

data/README.md

@@ -16,15 +16,17 @@ A command line tool to automate development workflow in ORA
 ## Tasks
 
   `new_feature_branch`: Help to create a new branch from up-to-date develop branch
-  
+
   `push_feature_branch`: Help to push your feature branch to remote ready for pull request
-  
+
   `push_to_staging`: Help to push your feature branch to staging
-  
+
   `push_to_uat`: Help to push your feature branch to uat
-  
+
   `push_to_master`: Help to push your feature branch to develop and master branches with a version tag
 
+  `switch_branch`: Help to switch branch without thinking about dirty files`
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ducktyper/ora-cli.

data/lib/ora/cli/bash.rb

@@ -1,9 +1,12 @@
+require "ora/cli/print.rb"
+
 module Ora::Cli
   class Bash
     def initialize(target, from: nil, print: Print.new)
-      @target = target
-      @from   = from
-      @print  = print
+      @target  = target
+      @from    = from
+      @print   = print
+      @success = true
     end
 
     def silent command
@@ -11,10 +14,12 @@ module Ora::Cli
     end
 
     def run commands
+      @success = true
       unprocessed_commands = extract commands
 
       outputs = []
       while (command = complete unprocessed_commands.shift)
+        next if command.empty?
         break unless call command do |output|
           outputs.push output
         end
@@ -25,6 +30,14 @@ module Ora::Cli
       join outputs
     end
 
+    def select command
+      `#{move}#{command} | #{selecta}`
+    end
+
+    def success?
+      @success
+    end
+
     private
     def move
       "cd #{@from} && " if @from
@@ -55,7 +68,7 @@ module Ora::Cli
     def call command
       @print.green command
 
-      success =
+      @success =
         if method? command
           call_method command
         else
@@ -63,8 +76,8 @@ module Ora::Cli
           $?.success?
         end
 
-      alert command unless success
-      success
+      alert command unless @success
+      @success
     end
     def method? command
       command.start_with? ":"
@@ -92,5 +105,9 @@ module Ora::Cli
         @print.red(complete unprocessed_command)
       end
     end
+
+    def selecta
+      @selecta ||= File.expand_path('../../../../bin/ora_selecta', __FILE__)
+    end
   end
 end

data/lib/ora/cli/stdin.rb

@@ -1,8 +1,11 @@
+require "ora/cli/print.rb"
+
 module Ora::Cli
   class Stdin
-    def initialize(inputs = [], print: Print.new)
-      @inputs = inputs
+    def initialize(bash:, print: Print.new, inputs: [])
+      @bash   = bash
       @print  = print
+      @inputs = inputs
     end
 
     def gets(pattern = '')
@@ -18,5 +21,9 @@ module Ora::Cli
 
       input
     end
+
+    def select(command)
+      @inputs.shift || @bash.select(command)
+    end
   end
 end

data/lib/ora/cli/task.rb

@@ -1,12 +1,18 @@
+require "ora/cli/bash.rb"
+require "ora/cli/print.rb"
+require "ora/cli/stdin.rb"
+
 module Ora::Cli
   class Task
     attr_reader :branch, :stdin, :print
 
+    MAIN_BRANCHES = %w{master develop staging uat}
+
     def initialize(from, inputs: [], print: Print.new)
       @from   = from
       @bash   = Bash.new(self, from: @from, print: print)
       @branch = current_branch
-      @stdin  = Stdin.new(inputs, print: print)
+      @stdin  = Stdin.new(bash: @bash, print: print, inputs: inputs)
       @print  = print
     end
 
@@ -18,13 +24,21 @@ module Ora::Cli
       raise "Override this method in subclass"
     end
 
+    def success?
+      @bash.success?
+    end
+
     private
     def current_branch
       @bash.silent('git branch | grep \\*').sub("*", "").strip
     end
 
+    def main_branch?
+      MAIN_BRANCHES.include? branch
+    end
+
     def feature_branch!
-      if %w{master develop staging uat}.include?(branch)
+      if main_branch?
         @print.red "Please checkout feature branch first!"
         false
       end

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

@@ -1,3 +1,5 @@
+require 'ora/cli/task'
+
 module Ora::Cli
   class NewFeatureBranch < Task
     attr_reader :branch_name

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

@@ -1,3 +1,5 @@
+require 'ora/cli/task'
+
 module Ora::Cli
   class PushFeatureBranch < Task
     def commands

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

@@ -1,3 +1,5 @@
+require 'ora/cli/task'
+
 module Ora::Cli
   class PushToMaster < Task
     attr_reader :version

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

@@ -1,3 +1,5 @@
+require 'ora/cli/task'
+
 module Ora::Cli
   class PushToStaging < Task
 

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

@@ -1,3 +1,5 @@
+require 'ora/cli/task'
+
 module Ora::Cli
   class PushToUat < Task
 

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

@@ -0,0 +1,41 @@
+require 'ora/cli/task'
+
+module Ora::Cli
+  class SwitchBranch < Task
+    attr_reader :target_branch
+
+    def commands
+      '
+      :only_feature_branch_can_be_dirty!
+      :switch_to
+      git stash save -u "OraCli"
+      git checkout #{target_branch}
+      #{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
+      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?
+      "git stash pop #{target_stash_revision}"
+    end
+    def target_stash_revision
+      @bash.silent("git stash list | grep '#{target_stash_name}' | sed s/:.*//").strip
+    end
+    def target_stash_name
+      "On #{target_branch}: OraCli"
+    end
+
+  end
+end

data/lib/ora/cli/version.rb

@@ -1,5 +1,5 @@
 module Ora
   module Cli
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/ora/cli.rb

@@ -1,19 +1,11 @@
+require "ora/cli/version.rb"
+
 module Ora
   module Cli
     def self.run task, from
+      require "ora/cli/tasks/#{task}"
       class_name = task.split('_').map(&:capitalize).join
       Object.const_get("Ora::Cli::#{class_name}").new(from).run
     end
   end
 end
-
-require "ora/cli/bash.rb"
-require "ora/cli/print.rb"
-require "ora/cli/stdin.rb"
-require "ora/cli/task.rb"
-require "ora/cli/version.rb"
-require "ora/cli/tasks/new_feature_branch.rb"
-require "ora/cli/tasks/push_feature_branch.rb"
-require "ora/cli/tasks/push_to_master.rb"
-require "ora/cli/tasks/push_to_staging.rb"
-require "ora/cli/tasks/push_to_uat.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ora-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ducksan Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - lib/ora/cli/tasks/push_to_master.rb
 - lib/ora/cli/tasks/push_to_staging.rb
 - lib/ora/cli/tasks/push_to_uat.rb
+- lib/ora/cli/tasks/switch_branch.rb
 - lib/ora/cli/version.rb
 - ora-cli.gemspec
 homepage: https://orahq.com