ora-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f2683d7437533d89260be6e9e6bc4c58835886
-  data.tar.gz: ca4045ee65cfffa7e5a213417fb06110baeac40e
+  metadata.gz: e9b3531e42723e70776f2ec5b5dc806157806b06
+  data.tar.gz: 4704d3f41cbb9133249f1f35f8db1caa4baad35f
 SHA512:
-  metadata.gz: d7831147f18cb4bf23daa857b9a36f59fabaa0ed9fccfa9ee3cc1f4c8cc1f5a4811243c96b8841ee5c5a64597ead5fbaea56a1d4596ab44d8b38bef5f038dfad
-  data.tar.gz: 90fc6a50ed74e3d084d1ba108d16899e03152ef2174fd26709029328dddf0cda400b03cc9415697c82c9a0d330b6018dac4cc6260d5b2977b1e0b8aec8009f2b
+  metadata.gz: 730713ebc04075a0613d433da72a06e10b3e609e666709af579c69b7cf98aac33b9859c274f32b8505fcc1b2b687485cc47e914385862147e221e47ec3f85676
+  data.tar.gz: 188f031c6f7a409d9e62d133736e2b5699c32fa668a9684d351b0a5a95872629dde9f86df78af3729f6e0d95241c70d69c0f586a5c42ea98e372ba19a02783f8

data/bin/ora

@@ -3,4 +3,4 @@
 
 require 'ora/cli'
 
-Ora::Cli.run
+Ora::Cli.run(ARGV[0])

data/lib/ora/cli/push_task.rb

@@ -8,10 +8,10 @@ module Ora::Cli
       :feature_branch!
       :clean_branch!
       :pull_branch
-      git checkout develop
-      git pull origin develop
+      git checkout #{develop_branch}
+      git pull origin #{develop_branch}
       git checkout #{branch}
-      git merge develop
+      git merge #{develop_branch}
       git checkout #{target}
       git pull origin #{target}
       git merge #{branch}

data/lib/ora/cli/task.rb

@@ -6,17 +6,18 @@ require "json"
 
 module Ora::Cli
   class Task
-    attr_reader :branch, :stdin, :print
+    attr_reader :branch, :stdin, :print, :develop_branch
 
-    DEVELOP_BRANCH = 'develop'
+    DEFAULT_DEVELOP_BRANCH = 'develop'
     CONTINUE_FILE  = '~/.ora_continue'
 
-    def initialize(from, inputs: [], print: Print.new)
-      @from   = from
-      @bash   = Bash.new(self, from: @from, print: print)
-      @branch = current_branch
-      @stdin  = Stdin.new(bash: @bash, print: print, inputs: inputs)
-      @print  = print
+    def initialize(from, inputs: [], print: Print.new, develop_branch: nil)
+      @from           = from
+      @bash           = Bash.new(self, from: @from, print: print)
+      @branch         = current_branch
+      @stdin          = Stdin.new(bash: @bash, print: print, inputs: inputs)
+      @print          = print
+      @develop_branch = develop_branch || DEFAULT_DEVELOP_BRANCH
     end
 
     def run
@@ -67,7 +68,7 @@ module Ora::Cli
     end
 
     def main_branches
-      [DEVELOP_BRANCH] +
+      [DEFAULT_DEVELOP_BRANCH, develop_branch].uniq +
       Dir.entries(Path.tasks).
         map {|name| name.match(/push_to_(.*)\.rb/)}.compact.
         map {|match| match[1]}

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

@@ -10,8 +10,8 @@ module Ora::Cli
       :new_branch!
       :clean_on_main_branch!
       git stash save -u "OraCli"
-      git checkout develop
-      git pull origin develop
+      git checkout #{develop_branch}
+      git pull origin #{develop_branch}
       git checkout -b #{branch_name}
       '
     end

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

@@ -7,10 +7,10 @@ module Ora::Cli
       :feature_branch!
       :clean_branch!
       :pull_branch
-      git checkout develop
-      git pull origin develop
+      git checkout #{develop_branch}
+      git pull origin #{develop_branch}
       git checkout #{branch}
-      git merge develop
+      git merge #{develop_branch}
       git push origin #{branch}
       '
     end

data/lib/ora/cli/version.rb

@@ -1,5 +1,5 @@
 module Ora
   module Cli
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/ora/cli.rb

@@ -5,7 +5,7 @@ require "ora/cli/task"
 
 module Ora
   module Cli
-    def self.run
+    def self.run(custom_develop_branch)
       project_path = `pwd`.strip
       remove_ext   = "sed 's/\.[^.]*$//'"
 
@@ -17,7 +17,7 @@ module Ora
 
         class_name = task.split('_').map(&:capitalize).join
         Object.const_get("Ora::Cli::#{class_name}").
-          new(project_path).
+          new(project_path, develop_branch: custom_develop_branch).
           continue(continue)
 
         return

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ora-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ducksan Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler