git-whistles 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a4748235c9aec27b999bc310925befb175bc3e
-  data.tar.gz: 018ed7e3b1ebbc8188ec00684a6cd4d62e1743ca
+  metadata.gz: 0dfecbaa72332d106bea15de20936889f5727b60
+  data.tar.gz: edb8b72b014ac70f5f30f14c3a9609b021dc3383
 SHA512:
-  metadata.gz: 572fde6b81c12c7f81466bac2701d70fa28b8f5632376a14ae03eae0a64addc48b8e2b4d90a7ded83f3dc3655c060f69288e017353b021e1837b113006312700
-  data.tar.gz: f4e65a332fc1a18160c9fb0a04abd9e2bafbd6419891b376073d6807a3ac18ba9d928e189d2955470cc411a35a38c32e695c46fc220ae01ac56f85ad16865248
+  metadata.gz: fe3610cc0f37ea562b1bcf9ff0752b28b82c9d2b238c79b35d92f010c1c4a45b42aa24164e293e8f159da8fc6ed12e4c681f6b5db61a323ce3327f2124d03169
+  data.tar.gz: 91f6f0a401f63ff6a555bc5426705bd7348baa9ab721a7624810a7a985d2857c2feaea8e0fef700fc17a329f493c4e8235922a09538df51affb2c318417c6bc9

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-whistles (0.10.0)
+    git-whistles (0.12.0)
       pivotal-tracker (~> 0.5.6)
       term-ansicolor
 
@@ -9,47 +9,60 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    coderay (1.0.9)
+    coderay (1.1.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    happymapper (0.4.1)
-      libxml-ruby (~> 2.0)
-    json (1.8.1)
-    libxml-ruby (2.7.0)
+    diff-lcs (1.2.5)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     nokogiri-happymapper (0.5.9)
       nokogiri (~> 1.5)
-    pivotal-tracker (0.5.12)
-      builder
+    pivotal-tracker (0.5.13)
       builder
       crack
-      happymapper (>= 0.3.2)
-      nokogiri (>= 1.4.3)
       nokogiri (>= 1.5.5)
       nokogiri-happymapper (>= 0.5.4)
-      rest-client (~> 1.6.0)
-      rest-client (~> 1.6.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+      rest-client (>= 1.8.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    rake (10.1.0)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rest-client (1.6.8)
-      mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
-    safe_yaml (1.0.3)
-    slop (3.4.6)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    rake (10.4.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    safe_yaml (1.0.4)
+    slop (3.6.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    tins (1.3.2)
+    tins (1.3.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
 
 PLATFORMS
   ruby
@@ -60,3 +73,4 @@ DEPENDENCIES
   pry
   pry-nav
   rake
+  rspec

data/HISTORY

@@ -1,3 +1,6 @@
+# 2015-04-09: 0.12.0
+* [FIX] git merge-po now properly handles 3-way merges (and is test covered)
+
 # 2013-08-23: 0.7.7
 * [FIX] git pivotal-branch was incorrectly using a git checkout alias
 

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2012-2013 HouseTrip Ltd
+parts Copyright (c) 2014-2015 Julien Letessier <julien.letessier@gmail.com>
 
 MIT License
 
@@ -19,4 +20,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -19,7 +19,7 @@ Use it with:
 | `git chop [branch ...]` | Deletes the local and origin copy of a branch. Useful to close feature branches once a feature is completed. It also accepts multiple branches separated by spaces [[David Silva](https://github.com/Davidslv)] |
 | `git list-branches [-l] [-r] [-i integration-branch]` | Colourful listing of all local or origin branches, and their distance to an integration branch (`master` by default). |
 | `git merge-po <ancestor> <left> <right>` | Merge engine for GetText PO files. |
-| `git select <story-id>`                  | Checkout a local branch with the matching number. If not found, lists remote branches |
+| `git select <story-id> [-p PREFIX]`                  | Checkout a local branch with the matching number. If not found, lists remote branches. With -p you can add a prefix to your local branch name.  |
 | `git latest-pushes [-n NR_RESULTS] [-p PATTERN]` | Show latest pushed branches to origin. Defaults to 20 results. Pattern is appended to refs/remotes/origin/ so include the team or project name to filter results. [[PedroCunha](https://github.com/PedroCunha)] |
 | `git pivotal-branch <story-id>` | Creates a branch name suggestion from the specified Pivotal Tracker story ID. It also comments on the story the branch name created and starts the story [[dncrht](https://github.com/dncrht)] |
 | `git pivotal-open [story-id]` | Opens the Pivotal Tracker story page for the current branch, from the specified Pivotal Tracker story ID or it is inferred from the branch name if not supplied [[khiet](https://github.com/khiet)] |

data/Rakefile

@@ -1,3 +1,7 @@
 #!/usr/bin/env rake
 # encoding: UTF-8
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/bin/git-explore

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 #
-# git-explore [-r ref] [-p path]
+# git-explore [-r ref] [-p path] [-l line[-line]]
 #
 #   Explore the given reference on the remote origin website
 #
@@ -12,28 +12,31 @@ require 'git-whistles/app'
 
 class App < Git::Whistles::App
 
-  GITHUB_URL = 'https://www.github.com'
+  GITHUB_URL = 'https://github.com'
 
   def main(args)
     super
     parse_args!(args)
 
-    remote_origin_url = run!("git config --get remote.origin.url").strip
+    @origin = run!("git config --get remote.origin.url").strip
 
-    die 'Unknown origin. Only github supported at the moment', :usage => true unless github?(remote_origin_url)
+    unless github?
+      die 'Unknown origin. Only github supported at the moment', usage: true
+    end
 
     # This has to support both variants
     # https://github.com/mezis/git-whistles.git
     # git@github.com:mezis/git-whistles.git
-    remote_origin_url.match /github\.com[:\/](.+)\.git/
-
-    die "Error parsing #{remote_origin_url} could not find repo" unless $1
+    unless @origin.match /github\.com[:\/](.+)\.git/
+      die "Error parsing #{@origin} could not find repo"
+    end
 
     repo      = $1
-    reference = "tree/#{ options.ref.strip }"
-    path      = options.path ? "#{ options.path.strip }" : ''
+    path      = options.path          ? "/#{ options.path.strip }" : nil
+    reference = path                  ? "/blob/#{ options.ref.strip }" : "/tree/#{ options.ref.strip }"
+    lines     = path && options.lines ? "##{options.lines.split('-').map{ |line| "L#{line}" }.join('-')}" : ''
 
-    url = "#{GITHUB_URL}/#{repo}/#{reference}/#{path}"
+    url = "#{GITHUB_URL}/#{repo}#{reference}#{path}#{lines}"
 
     puts "opening #{ url }..."
     run! "open #{ url }"
@@ -41,24 +44,28 @@ class App < Git::Whistles::App
 
   def defaults
     {
-      :ref  => run!('git rev-parse --abbrev-ref HEAD'),
-      :file => nil
+      ref:  run!('git rev-parse --abbrev-ref HEAD'),
+      file: nil
     }
   end
 
   def option_parser
     @option_parser ||= OptionParser.new do |op|
-      op.banner = "Usage: git explore [-b branch] [-f file]"
+      op.banner = "Usage: git explore [-r ref] [-p path] [-l line[-line]]"
 
-      op.on("-r", "--ref REFERENCE", "Reference to explore. Defaults to current branch") do |ref|
+      op.on('-r', '--ref REFERENCE', 'Reference to explore. Defaults to current branch') do |ref|
         options.ref = ref
       end
 
-      op.on("-p", "--path PATH", "Path to explore. Defaults to /") do |path|
+      op.on('-p', '--path PATH', 'Path to explore. Defaults to /') do |path|
         options.path = path
       end
 
-      op.on_tail("-h", "--help", "Show this message") do
+      op.on('-l', '--line LINE', 'Line(s) to highlight. Examples: "2", "10-15". Defaults to nil') do |lines|
+        options.lines = lines
+      end
+
+      op.on_tail('-h', '--help', 'Show this message') do
         puts op
         exit
       end
@@ -66,8 +73,9 @@ class App < Git::Whistles::App
   end
 
   private
-  def github?(origin)
-    origin.match %r{github.com} 
+
+  def github?
+    @origin.match %r{github.com}
   end
 
 end

data/bin/git-select

@@ -22,7 +22,7 @@ class App < Git::Whistles::App
     parse_args!(args)
 
     die "Missing story id", :usage => true     if args.count == 0
-    die "Too many arguments", :usage => true   if args.count > 1
+    die "Too many arguments", :usage => true   if args.count > 2
 
     story_id = args.first
 
@@ -61,13 +61,17 @@ class App < Git::Whistles::App
     when 0
       puts yellow 'failed lookup on remote branches'
     when 1
-      if options.remote_checkout
+      if options.prefix
+        `git checkout --track -b #{options.prefix_value}/#{branch_name(found.first)} origin/#{branch_name(found.first)}`
+        exit 0
+      elsif options.remote_checkout
         `git checkout #{branch_name(found.first)}`
         exit 0
       else
         puts "found #{green(branch_name(found.first))} on remote"
         puts "by default remote branches are not checked out" 
         puts "if you want to checkout do: #{green "git select -r #{story_id}"}"
+        puts "if you want to checkout with a prefix: #{green "git select -o #{story_id}"}"
         exit 1
       end
     else
@@ -94,6 +98,11 @@ class App < Git::Whistles::App
         options.remote_checkout = true
       end
 
+      op.on("-p", "--prefix PREFIX", "Checkout a remote branch and adds a prefix to the branch name") do |v|
+        options.prefix = true
+        options.prefix_value = v
+      end
+
       op.on_tail("-h", "--help", "Show this message") do
         puts op
         exit

data/git-whistles.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "rspec"
 
   if RUBY_VERSION < "1.9"
     gem.add_dependency "nokogiri",        "~> 1.5.10"

data/lib/git-whistles/version.rb

@@ -4,7 +4,7 @@ require 'pathname'
 
 module Git
   module Whistles
-    VERSION = "0.10.0"
+    VERSION = "0.12.0"
     GEMDIR = Pathname.new(__FILE__).parent.parent.parent
   end
 end

data/libexec/git-merge-po.sh

@@ -1,26 +1,115 @@
 #!/bin/sh
 #
-# git-merge-po --
-# 
-#   Custom Git merge driver - merges PO files using msgcat(1)
-# 
-O=$1
-A=$2
-B=$3
+# Three-way merge driver for PO files
+#
+set -e
+
+# failure handler
+on_error() {
+  local parent_lineno="$1"
+  local message="$2"
+  local code="${3:-1}"
+  if [[ -n "$message" ]] ; then
+    echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}"
+  else
+    echo "Error on or near line ${parent_lineno}; exiting with status ${code}"
+  fi
+  exit 255
+}
+trap 'on_error ${LINENO}' ERR
+
+# given a file, find the path that matches its contents
+show_file() {
+  hash=`git hash-object "${1}"`
+  git ls-tree -r HEAD | fgrep "$hash" | cut -b54-
+}
+
+# wraps msgmerge with default options
+function m_msgmerge() {
+  msgmerge --force-po --quiet --no-fuzzy-matching $@
+}
+
+# wraps msgcat with default options
+function m_msgcat() {
+  msgcat --force-po $@
+}
+
+
+# removes the "graveyard strings" from the input
+function strip_graveyard() {
+  sed -e '/^#~/d'
+}
+
+# select messages with a conflict marker
+# pass -v to inverse selection
+function grep_conflicts() {
+  msggrep $@ --msgstr -F -e '#-#-#' -
+}
+
+# select messages from $1 that are also in $2 but whose contents have changed
+function extract_changes() {
+  msgcat -o - $1 $2 \
+    | grep_conflicts \
+    | m_msgmerge -o - $1 - \
+    | strip_graveyard
+}
+
+
+BASE=$1
+LOCAL=$2
+REMOTE=$3
+OUTPUT=$LOCAL
+TEMP=`mktemp /tmp/merge-po.XXXX`
+
+echo "Using custom PO merge driver (`show_file ${LOCAL}`; $TEMP)"
 
 # Extract the PO header from the current branch (top of file until first empty line)
-header=$(mktemp /tmp/merge-po.XXXX)
-sed -e '/^$/q' < $A > $header
+sed -e '/^$/q' < $LOCAL > ${TEMP}.header
+
+# clean input files
+msguniq --force-po -o ${TEMP}.base   --unique ${BASE}
+msguniq --force-po -o ${TEMP}.local  --unique ${LOCAL}
+msguniq --force-po -o ${TEMP}.remote --unique ${REMOTE}
+
+# messages changed on local
+extract_changes ${TEMP}.local ${TEMP}.base > ${TEMP}.local-changes
+
+# messages changed on remote
+extract_changes ${TEMP}.remote ${TEMP}.base > ${TEMP}.remote-changes
+
+# unchanged messages
+m_msgcat -o - ${TEMP}.base ${TEMP}.local ${TEMP}.remote \
+  | grep_conflicts -v \
+  > ${TEMP}.unchanged
 
-# Merge files, then repair header
-temp=$(mktemp /tmp/merge-po.XXXX)
-msgcat -o $temp $A $B
-msgcat --use-first -o $A $header $temp
+# messages changed on both local and remote (conflicts)
+m_msgcat -o - ${TEMP}.remote-changes ${TEMP}.local-changes \
+  | grep_conflicts \
+  > ${TEMP}.conflicts
 
-# Clean up
-rm $header $temp
+# messages changed on local, not on remote; and vice-versa
+m_msgcat -o ${TEMP}.local-only  --unique ${TEMP}.local-changes  ${TEMP}.conflicts
+m_msgcat -o ${TEMP}.remote-only --unique ${TEMP}.remote-changes ${TEMP}.conflicts
 
-# Check for conflicts
-conflicts=$(grep -c "#-#" $A)
-test $conflicts -gt 0 && exit 1
+# the big merge
+m_msgcat -o ${TEMP}.merge1 ${TEMP}.unchanged ${TEMP}.conflicts ${TEMP}.local-only ${TEMP}.remote-only
+
+# create a template to filter messages actually needed (those on local and remote)
+m_msgcat -o - ${TEMP}.local ${TEMP}.remote \
+  | m_msgmerge -o ${TEMP}.merge2 ${TEMP}.merge1 -
+
+# final merge, adds saved header
+m_msgcat -o ${TEMP}.merge3 --use-first ${TEMP}.header ${TEMP}.merge2
+
+# produce output file (overwrites input LOCAL file)
+cat ${TEMP}.merge3 > $OUTPUT
+
+# check for conflicts
+if grep '#-#' $OUTPUT > /dev/null ; then
+  echo "Conflict(s) detected"
+  echo "   between ${TEMP}.local and ${TEMP}.remote"
+  exit 1
+fi
+rm -f ${TEMP}*
 exit 0
+

data/spec/data/base.po

@@ -0,0 +1,38 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Base header\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "This little piggie is unchanged"
+msgstr "1"
+
+msgid "This little piggie is removed from remote, unchanged on local"
+msgstr "2"
+
+msgid "This little piggie is removed from remote, changed on local"
+msgstr "3"
+
+msgid "This little piggie is removed from local, unchanged on remote"
+msgstr "4"
+
+msgid "This little piggie is removed from local, changed on remote"
+msgstr "5"
+
+msgid "This little piggie is changed on local, unchanged on remote"
+msgstr "6"
+
+msgid "This little piggie is changed on remote, unchanged on local"
+msgstr "7"
+
+msgid "This little piggie is changed on remote and local"
+msgstr "8"
+
+# msgid "This little piggie is added on remote, not on local"
+# msgstr "9"
+#
+# msgid "This little piggie is added on local, not on remote"
+# msgstr "10"
+#
+# msgid "This little piggie is added on local and remote, with different values"
+# msgstr "11"
+

data/spec/data/local.po

@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Local header\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "This little piggie is unchanged"
+msgstr "1"
+
+msgid "This little piggie is removed from remote, unchanged on local"
+msgstr "2"
+
+msgid "This little piggie is removed from remote, changed on local"
+msgstr "3.local"
+
+# msgid "This little piggie is removed from local, unchanged on remote"
+# msgstr "4"
+
+# msgid "This little piggie is removed from local, changed on remote"
+# msgstr "5"
+
+msgid "This little piggie is changed on local, unchanged on remote"
+msgstr "6.local"
+
+msgid "This little piggie is changed on remote, unchanged on local"
+msgstr "7"
+
+msgid "This little piggie is changed on remote and local"
+msgstr "8.local"
+
+# msgid "This little piggie is added on remote, not on local"
+# msgstr "9"
+
+msgid "This little piggie is added on local, not on remote"
+msgstr "10.local"
+
+msgid "This little piggie is added on local and remote, with different values"
+msgstr "11.local"
+
+

data/spec/data/remote.po

@@ -0,0 +1,39 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Remote header\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "This little piggie is unchanged"
+msgstr "1"
+
+# msgid "This little piggie is removed from remote, unchanged on local"
+# msgstr "2"
+
+# msgid "This little piggie is removed from remote, changed on local"
+# msgstr "3"
+
+msgid "This little piggie is removed from local, unchanged on remote"
+msgstr "4"
+
+msgid "This little piggie is removed from local, changed on remote"
+msgstr "5.remote"
+
+msgid "This little piggie is changed on local, unchanged on remote"
+msgstr "6"
+
+msgid "This little piggie is changed on remote, unchanged on local"
+msgstr "7.remote"
+
+msgid "This little piggie is changed on remote and local"
+msgstr "8.remote"
+
+msgid "This little piggie is added on remote, not on local"
+msgstr "9.remote"
+
+# msgid "This little piggie is added on local, not on remote"
+# msgstr "10"
+
+msgid "This little piggie is added on local and remote, with different values"
+msgstr "11.remote"
+
+

data/spec/git_merge_po_spec.rb

@@ -0,0 +1,96 @@
+require 'tempfile'
+require 'pry'
+
+def example_title
+  RSpec.current_example.description
+end
+
+# a trivial PO file loader. returns a hash.
+def load_po(data)
+  h = {}
+  state = :none # :id, :str
+  id = ""
+  str = ""
+  (data.split("\n") + ['']).each do |line|
+
+    case state
+    when :none
+      next if line =~ /^$|^#/
+      fail unless line =~ /^msgid "(.*)"$/
+      id = $1
+      state = :id
+    when :id
+      if line =~ /^msgstr "(.*)"/
+        state = :str
+        str = $1
+        next
+      end
+      fail unless line =~ /^"(.*)"$/
+      id += $1
+    when :str
+      if line =~ /^$|^#/
+        state = :none
+        h[id] = str
+        next
+      end
+      fail unless line =~ /^"(.*)"$/
+      str += $1
+    end
+  end
+  h
+end
+
+describe 'git merge-po' do
+  subject do
+    f_local  = Tempfile.new('spec')
+    f_base   = Tempfile.new('spec')
+    f_remote = Tempfile.new('spec')
+
+    f_local.write  File.read('spec/data/local.po')
+    f_base.write   File.read('spec/data/base.po')
+    f_remote.write File.read('spec/data/remote.po')
+
+    f_local.flush
+    f_base.flush
+    f_remote.flush
+
+    system "./libexec/git-merge-po.sh #{f_base.path} #{f_local.path} #{f_remote.path}"
+
+    data = f_local.tap(&:rewind).read
+    # Uncomment to get a readable output file:
+    # File.open('spec/data/output.po', 'w') { |io| io.write data }
+    
+    load_po(data)
+  end
+
+  {
+    "This little piggie is unchanged"                                 => '1',
+    "This little piggie is removed from remote, unchanged on local"   => '2',
+    "This little piggie is removed from remote, changed on local"     => '3.local',
+    "This little piggie is removed from local, unchanged on remote"   => '4',
+    "This little piggie is removed from local, changed on remote"     => '5.remote',
+    "This little piggie is changed on local, unchanged on remote"     => '6.local',
+    "This little piggie is changed on remote, unchanged on local"     => '7.remote',
+    "This little piggie is added on remote, not on local"             => '9.remote',
+    "This little piggie is added on local, not on remote"             => '10.local'
+  }.each_pair do |piggie, value|
+    it piggie do
+      expect(subject[piggie]).to eq(value)
+    end
+  end
+
+  it 'This little piggie is changed on remote and local' do
+    value = subject[example_title]
+    expect(value).to include('8.local')
+    expect(value).to include('8.remote')
+    expect(value).to include('#-#-#')
+  end
+
+  it 'This little piggie is added on local and remote, with different values' do
+    value = subject[example_title]
+    expect(value).to include('11.local')
+    expect(value).to include('11.remote')
+    expect(value).to include('#-#-#')
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,91 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-whistles
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Julien Letessier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - HISTORY
@@ -144,6 +159,11 @@ files:
 - libexec/git-merge-po.sh
 - libexec/git-stash-and-checkout.sh
 - libexec/runner.rb
+- spec/data/base.po
+- spec/data/local.po
+- spec/data/remote.po
+- spec/git_merge_po_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/mezis/git-whistles
 licenses:
 - MIT
@@ -164,9 +184,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'A few helpers for classic Git workflows: makes branching and merging, PO
   file handling, issuing pull requests slightly simpler.'
-test_files: []
+test_files:
+- spec/data/base.po
+- spec/data/local.po
+- spec/data/remote.po
+- spec/git_merge_po_spec.rb
+- spec/spec_helper.rb
+has_rdoc: