zenflow 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08056c15bf04111493669ac5810d2bee09e1809b
-  data.tar.gz: de40476d5eb7b2bbed54f67f8b9e451ef3a48b07
+  metadata.gz: 760e912aa2ad201df500d0a421839c5fa26411bb
+  data.tar.gz: 4bcaa9ef762b80454c8a1cf27181e008d174516c
 SHA512:
-  metadata.gz: 3c14ab625a909bb5afbaf2cb20a61a909ef081f3230e2dbc9fd49db22d02b3a56d702b6a84fe0c20e073a9b60fe9d93ffb87ccb5839e3fd23d30bc963bc2a8ec
-  data.tar.gz: c13bd23582fd6e0c5eee98eaddc4fd67efcc7749d40a036a5da6b36bf9864b6dd5d05322ffb7f6554a9cb231198f7bae7f107fb83c9a7a4acf05a77774d97c27
+  metadata.gz: 0c438deb0f3d413cf5432b407b0515bde93e52dcf3083d9ce4d3a2c46595cb0773d0f15638187fa2366f25b36d61de3fc37fe6a0fc07a550eb925c347880ff66
+  data.tar.gz: 94c98d1472729f3485bb956f52e1a81e859b42cad8287108d68b837ad65141c62246e6397a00967771d00cb844464e3e43ad4f8368bc05b7e68364bd7e264465

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.2

data/Gemfile.lock

@@ -1,35 +1,36 @@
 PATH
   remote: .
   specs:
-    zenflow (0.8.5)
+    zenflow (0.8.7)
       colored (~> 1.2)
-      httparty (~> 0.12.0)
+      httparty (~> 0.13.0)
       terminal-table (~> 1.4.5)
-      thor (~> 0.18.1)
+      thor (~> 0.19.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
+    byebug (3.1.2)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     coderay (1.1.0)
     colored (1.2)
-    columnize (0.3.6)
+    columnize (0.8.9)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    debugger (1.6.5)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
     diff-lcs (1.2.5)
     ffi (1.9.3)
     formatador (0.2.4)
@@ -37,34 +38,36 @@ GEM
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 1.0)
-    guard (2.2.5)
+    guard (2.6.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
     guard-rspec (3.0.3)
       guard (>= 1.8)
       rspec (~> 2.13)
-    httparty (0.12.0)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     json (1.8.1)
-    listen (2.4.0)
+    listen (2.7.4)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.5)
     method_source (0.8.2)
-    mime-types (2.0)
-    multi_json (1.8.4)
+    mime-types (2.2)
+    multi_json (1.10.0)
     multi_xml (0.5.5)
-    pry (0.9.12.4)
+    nio4r (1.0.0)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -72,24 +75,24 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.14.4)
-    ruby-progressbar (1.4.0)
-    safe_yaml (0.9.7)
+    rspec-mocks (2.14.6)
+    ruby-progressbar (1.4.2)
+    safe_yaml (1.0.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.7)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    slop (3.5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     terminal-table (1.4.5)
-    thor (0.18.1)
+    thor (0.19.1)
     timers (1.1.0)
-    tins (0.13.1)
+    tins (1.1.0)
     vcr (2.5.0)
     webmock (1.13.0)
       addressable (>= 2.2.7)
@@ -99,8 +102,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   coveralls
-  debugger (~> 1.6.1)
   fuubar (~> 1.1.1)
   guard-rspec (~> 3.0.2)
   rspec (~> 2.14)

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 major: 0
 minor: 8
-patch: 6
+patch: 7
 pre:

data/lib/zenflow/helpers/branch_commands/review.rb

@@ -16,7 +16,7 @@ module Zenflow
               already_created?(Zenflow::PullRequest.find_by_ref("#{flow}/#{branch_name}"))
 
               pull = Zenflow::PullRequest.create(
-                base:  branch(:source),
+                base:  branch(:destination) || branch(:source),
                 head:  "#{flow}/#{branch_name}",
                 title: "#{flow}: #{branch_name}",
                 body:  Zenflow::Ask("Describe this #{flow}:", required: true)

data/lib/zenflow/helpers/changelog.rb

@@ -10,7 +10,7 @@ module Zenflow
         return unless exist?
         change = prompt_for_change(options)
         if change
-          prepend_change_to_changelog(change, options)
+          prepend_change_to_changelog("* #{change}", options)
         else
           rotate(:commit => true) if options[:rotate]
         end
@@ -25,8 +25,9 @@ module Zenflow
       def prepend_change_to_changelog(change, options={})
         return unless exist?
         new_changes = Zenflow::Shell.shell_escape_for_single_quoting(change)
+        prepended_changelog = prepended_changelog(new_changes)
         File.open("CHANGELOG.md", "w") do |f|
-          f.write prepended_changelog(new_changes)
+          f.write prepended_changelog
         end
         rotate(:name => options[:name]) if options[:rotate]
         Zenflow::Shell["git add CHANGELOG.md && git commit -a -m 'Adding line to CHANGELOG: #{new_changes}'"]
@@ -38,7 +39,6 @@ module Zenflow
         <<-EOS
 #{new_changes}
 #{existing_changes}
---------------------------------------------------------------------------------
 #{changelog}
         EOS
       end
@@ -68,9 +68,8 @@ module Zenflow
         return unless exist?
         changelog = File.read("CHANGELOG.md").strip
         changes = changelog.split("--------------------------------------------------------------------------------")[0]
-        return if changes.strip.empty?
-        changelog = changelog.sub(changes, "")
-        return changes.strip, changelog
+        changelog = changelog.sub(changes, "") if changes
+        return changes.to_s.strip, changelog
       end
 
       def row_name(name=nil)

data/spec/zenflow/helpers/branch_command_spec.rb

@@ -177,7 +177,7 @@ module BranchCommandSpec
             pull = double(valid?: true)
             pull.stub(:[]).with("html_url").and_return("URL")
             Zenflow::PullRequest.should_receive(:create).with(
-              base:  "master",
+              base:  "production",
               head:  "test/new-test-branch",
               title: "test: new-test-branch",
               body:  "A great test"
@@ -195,7 +195,7 @@ module BranchCommandSpec
           before do
             Zenflow.should_receive(:Ask).with("Describe this test:", required: true).and_return("A great test")
             Zenflow::PullRequest.should_receive(:create).with(
-              base:  "master",
+              base:  "production",
               head:  "test/new-test-branch",
               title: "test: new-test-branch",
               body:  "A great test"

data/spec/zenflow/helpers/changelog_spec.rb

@@ -18,7 +18,7 @@ describe Zenflow::Changelog do
         before { Zenflow::Changelog.should_receive(:prompt_for_change).and_return('wrote tests for updating the changelog') }
 
         it "prepends the change to the changelog and returns the change" do
-          Zenflow::Changelog.should_receive(:prepend_change_to_changelog).with('wrote tests for updating the changelog', {})
+          Zenflow::Changelog.should_receive(:prepend_change_to_changelog).with('* wrote tests for updating the changelog', {})
           expect(Zenflow::Changelog.update).to eq('wrote tests for updating the changelog')
         end
       end
@@ -85,7 +85,7 @@ describe Zenflow::Changelog do
   describe '.prepended_changelog' do
     it "returns the new changes prepended to the existing changelog" do
       Zenflow::Changelog.should_receive(:get_changes).and_return(['test branching', 'amongst other things'])
-      expect(Zenflow::Changelog.prepended_changelog('test prepended changelog')).to eq("test prepended changelog\ntest branching\n--------------------------------------------------------------------------------\namongst other things\n")
+      expect(Zenflow::Changelog.prepended_changelog('test prepended changelog')).to eq("test prepended changelog\ntest branching\namongst other things\n")
     end
   end
 
@@ -154,12 +154,12 @@ describe Zenflow::Changelog do
 
       context "but there are no changes" do
         before do
-          file = "\n--------------------------------------------------------------------------------\nold changes"
-          File.should_receive(:read).with('CHANGELOG.md').and_return(file)
+          @file = "\n--------------------------------------------------------------------------------\nold changes"
+          File.should_receive(:read).with('CHANGELOG.md').and_return(@file)
         end
 
-        it 'returns nil' do
-          expect(Zenflow::Changelog.get_changes).to be_nil
+        it 'returns the no new changes, but include old changes' do
+          expect(Zenflow::Changelog.get_changes).to eq(["", @file.strip])
         end
       end
 

data/zenflow.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.description = "Zenflow is a development workflow management tool."
   s.license     = 'MIT'
   s.executables << "zenflow"
-  s.add_dependency "thor", "~> 0.18.1"
+  s.add_dependency "thor", "~> 0.19.0"
   s.add_dependency "colored", "~> 1.2"
   s.add_dependency "terminal-table", "~> 1.4.5"
-  s.add_dependency "httparty", "~> 0.12.0"
+  s.add_dependency "httparty", "~> 0.13.0"
   s.add_development_dependency('rspec', '~> 2.14')
   s.add_development_dependency('simplecov', '~> 0.7.1')
-  s.add_development_dependency('debugger', '~> 1.6.1')
+  s.add_development_dependency('byebug')
   s.add_development_dependency('fuubar', '~> 1.1.1')
   s.add_development_dependency('guard-rspec', '~> 3.0.2')
   s.add_development_dependency('vcr', '~> 2.5.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenflow
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Adam Kittelson
@@ -10,160 +10,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.13.0
 description: Zenflow is a development workflow management tool.
@@ -176,11 +176,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .zenflow
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".zenflow"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -259,17 +259,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Branch management and deployment tool.