sah 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbea4bc8326aacb553a17e683d23d5a23ea8000a
-  data.tar.gz: 1ef2ebeed7626f758fee80476babb3eb6b04044d
+  metadata.gz: db632c3e30f681ebb32cbd7de8def2f30d48d84d
+  data.tar.gz: 78b56e57314886eef1eacc03ef765d977916c847
 SHA512:
-  metadata.gz: 05f4c052ba5079b21d789b4e352827643eca0af9363ad23cae207ea12df20bd64ac086f41d2b218f9ba7c3a4f567e300000e2e770b00313a86dbc6df5cf2e4bb
-  data.tar.gz: 2d15b5d41ae35f306cfa2df2412880863d9b614f37e3aaa048b276dfc60c754140acb21c5c34e8a0ccec05ec7cfd23934f40d09351ab968d656b212f2d406579
+  metadata.gz: 353ce0328e18b0f1ec14ce3d481dd4074dc92b1d104cc6885d00fcca2fefbfc256605ae0d97d2a4ba462c6e8f64003eb73833304a2c16dcbc881c02ab33295f4
+  data.tar.gz: afd4a367f3beb492d3aa9ca68c8c88ff918119ec6f0b27ca40d853cbe50f7cba2f796101dd910d9454bcfa454f134e632388ecc97df5a620c62291af57397a11

data/README.md

@@ -124,7 +124,7 @@ If you use multiple Bitbucket Server, define profile(s) and specify it.
     sah upstream
     # show upstream information
 
-    sah upstream --add-remote [--fetch-pull-request] [--prevent-push]
+    sah upstream --add-remote [--fetch-pull-request] [--prevent-push] [--remote-name=REMOTE-NAME]
     # add upstream to remote settings
 
 #### configutration
@@ -135,6 +135,9 @@ If you use multiple Bitbucket Server, define profile(s) and specify it.
 - `git config --global sah.config.upstream-prevent-push true`  
   (the same as `--prevent-push` option)  
   Setting this option to true will Prevent push to upstream repository.
+- `git config --global sah.config.upstream-remote-name hoge`  
+  (the same as `--remote-name` option)  
+  Setting this option to any value will specify git remote name of upstream repository.
 
 ### user
 

data/lib/sah/cli.rb

@@ -224,7 +224,7 @@ module Sah
     def pull_request
       source_project, source_repository, source_branch = nil, nil, nil
       if options[:source]
-        m = options[:source].match(%r{^([^/:]+)/([^/:]+):([^/:]+)$})
+        m = options[:source].match(%r{^([^/:]+)/([^/:]+):([^:]+)$})
         if m.nil?
           abort "Invalid format: --source #{options[:source]}"
         end
@@ -240,7 +240,7 @@ module Sah
 
       target_project, target_repository, target_branch = nil, nil, nil
       if options[:target]
-        m = options[:target].match(%r{^([^/:]+)/([^/:]+):([^/:]+)$})
+        m = options[:target].match(%r{^([^/:]+)/([^/:]+):([^:]+)$})
         if m.nil?
           abort "Invalid format: --target #{options[:target]}"
         end
@@ -316,24 +316,27 @@ module Sah
     upstream
     \x5# show upstream information
 
-    upstream --add-remote [--fetch-pull-request] [--prevent-push]
+    upstream --add-remote [--fetch-pull-request] [--prevent-push] [--remote-name=REMOTE-NAME]
     \x5# add upstream to remote settings
     LONG_DESCRIPTION
     method_option :"add-remote", desc: "Add a upstream repository to remote settings"
     method_option :"fetch-pull-request", desc: "Fetch pull requests"
     method_option :"prevent-push", desc: "Prevent push to upstream"
+    method_option :"remote-name", type: :string, default: "", desc: "Specify a remote name of upstream"
     def upstream
       upstream_url =
         upstream_repository["origin"]["links"]["clone"].find{ |e| e["name"] == config.protocol }["href"]
 
       if options[:"add-remote"]
-        system "git", "remote", "add", "upstream", upstream_url
+        remote_name = options["remote-name"]
+        remote_name = config.upstream_remote_name if remote_name.nil? || remote_name.empty?
+        system "git", "remote", "add", remote_name, upstream_url
         if config.upstream_fetch_pull_request || options[:"fetch-pull-request"]
-            %x(git config --add remote.upstream.fetch \
-                 '+refs/pull-requests/*:refs/remotes/upstream/pull-requests/*')
+            %x(git config --add remote.#{remote_name}.fetch \
+                 '+refs/pull-requests/*:refs/remotes/#{remote_name}/pull-requests/*')
         end
         if config.upstream_prevent_push || options[:"prevent-push"]
-          %x(git remote set-url --push upstream "")
+          %x(git remote set-url --push #{remote_name} "")
         end
       else
         puts upstream_url

data/lib/sah/config.rb

@@ -4,12 +4,14 @@ module Sah
   class Config
     attr_accessor :user, :password, :url,
       :upstream_fetch_pull_request, :upstream_prevent_push,
+      :upstream_remote_name,
       :protocol, :verbose
 
     def initialize(profile, verbose: false)
       @user, @password, @url = nil, nil, nil
       @upstream_fetch_pull_request = false
       @upstream_prevent_push = false
+      @upstream_remote_name = "upstream"
       @protocol = "ssh"
       @verbose = verbose
 
@@ -28,6 +30,8 @@ module Sah
           @upstream_fetch_pull_request = ($1 == "true")
         when /#{config_prefix}\.upstream-prevent-push (.*)$/
           @upstream_prevent_push = ($1 == "true")
+        when /#{config_prefix}\.upstream-remote-name (.*)$/
+          @upstream_remote_name = $1
         when /#{config_prefix}\.protocol (.*)$/
           @protocol = $1
         end

data/lib/sah/version.rb

@@ -1,3 +1,3 @@
 module Sah
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sah
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - f440
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor