git-daily 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 33c7143c4b0caf5b1301db3913c282c45f056da3
+  data.tar.gz: c68f7e44f3b492f22abc221c92273c5ed5eaccc9
+SHA512:
+  metadata.gz: a4facd683775812ca91846037cc84f43a8c8f7e3bed143a5163d9b926ce1c02246d158bb90695af7604644cc21b6bf866a5fc7a692651e86d4694d714135d5bc
+  data.tar.gz: 38cce6cace7e9f9e9bc94844e3d1493aaffcea5ddb6ee0017465d5a06ebabe5454af5bb53545d67cc2841b2180a0dc744baabe1b07a68e10d5cdd5f7a2db86c6

data/README.rst

@@ -1,7 +1,9 @@
 git-daily
 ===========================
 
-"git-daily" is a tool which helps you to do daily workflow easier.
+"git-daily on Ruby" is a tool which helps you to do daily workflow easier on Git. This is the Ruby version. 
+
+The original PHP version is here: https://github.com/sotarok/git-daily
 
 Sub-commands are::
 
@@ -31,14 +33,15 @@ Requirements
 Installation
 --------------------------
 
-Install from openpear.org ::
+Install from rubygems ::
 
-    gem instasll git-daily
+    gem install git-daily
 
 Install develop version ::
 
     cd /path/to/dir
     git clone git://github.com/koichiro/git-daily.git
+    cd git-daily
     rake build
     gem install pkg/git-daily-X.X.X.gem
 

data/lib/git-daily/command.rb

@@ -56,6 +56,12 @@ module Git
         r.empty? ? nil : r
       end
 
+      def self.pull_request_url
+        r = `git config gitdaily.pullRequestUrl`
+        r.chomp!
+        r.empty? ? nil : r
+      end
+
       def self.current_branch
         r = `git branch --no-color`.split(/\n/)
         master = r.select { |v| v[/^\*/] }

data/lib/git-daily/command/release.rb

@@ -47,7 +47,7 @@ module Git
 
         rel_branches = Command.release_branches(@branch_prefix)
         unless rel_branches.empty?
-          raise "release process (on local) is not closed, so cannot open relase\n    release branches: #{rel_branches.join(',')}"
+          raise "release process (on local) is not closed, so cannot open release\n    release branches: #{rel_branches.join(',')}"
         end
 
         remote = Command.remote
@@ -57,7 +57,7 @@ module Git
 
           rels = `git branch -a --no-color`.split(/\n/).select { |b| b[/remotes\/#{remote}\/#{@branch_prefix}/]}
           unless rels.empty?
-            raise "relase process (on local) is not closed, so cannot open releas\n    relase branchs: #{rels.join(',')}"
+            raise "release process (on local) is not closed, so cannot open release\n    release branches: #{rels.join(',')}"
           end
         end
 
@@ -237,7 +237,7 @@ module Git
             end
 
             if r_rel_branch != rel
-              $stderr.puts "Closed old relase branch"
+              $stderr.puts "Closed old release branch"
               $stderr.puts "Please retry 'release sync'"
             end
             puts "sync to release close"
@@ -288,7 +288,13 @@ module Git
         end
 
         current_branch = Command.current_branch
-        master_branch = Command.master
+
+        remote = Command.remote
+        master_branch = if remote
+                          Command.remote_branch(remote, Command.master)
+                        else
+                          Command.master
+                        end
 
         puts "first, fetch remotes"
         `git fetch --all`
@@ -369,6 +375,20 @@ module Git
             puts
           end
         end
+
+        if Command.pull_request_url
+          puts 'Pull Requests: '
+
+          urlBase = Command.pull_request_url
+          merges = `git log --merges --pretty=format:'%<(30)%s | %an' #{master_branch}..#{current_branch}`.split(/\n/)
+
+          merges.each do |merge|
+            merge.match(/^Merge pull request #(?<id>[1-9][0-9]*) .+$/) do |match|
+              url = sprintf(urlBase,  match[:id])
+              puts "\t#{url} | #{match[0]}"
+            end
+          end
+        end
       end
 
       def usage

data/lib/git-daily/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Daily
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/test_command_release.rb

@@ -9,7 +9,7 @@ class TestCommandRelease < Test::Unit::TestCase
     @command = Git::Daily::Release.new
   end
 
-  def test_relase_open
+  def test_release_open
     @command.open
   end
 

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: git-daily
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Koichiro Ohba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies: []
-description: ! 'git-daily on Ruby is a tool which helps you to do daily workflow easier
+description: 'git-daily on Ruby is a tool which helps you to do daily workflow easier
   on Git. This is the Ruby version. The original PHP version is here: https://github.com/sotarok/git-daily'
 email:
 - koichiro@meadowy.org
@@ -20,7 +19,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.rst
@@ -46,27 +45,26 @@ files:
 - test/test_init_input.txt
 homepage: https://github.com/koichiro/git-daily
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: git-daily
-rubygems_version: 1.8.11
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: git-daily on ruby is a tool which helps you to do daily workflow easier on
   Git.
 test_files:
@@ -74,4 +72,3 @@ test_files:
 - test/test_command_init.rb
 - test/test_command_release.rb
 - test/test_init_input.txt
-has_rdoc: