git_pretty_accept 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1bb08233347e08a6009b258782b3bb44798f530f
+  data.tar.gz: 224d416caa7722a452245b09fd3bd684addd3a84
+SHA512:
+  metadata.gz: 309b1c8978ec26fecb968dfce874f7cac64fd33ef3fb2662c125659f2b97a5ed558886692866c621c2ab430d3fa50c930231213bb570c190f367247cfc9a1bc5
+  data.tar.gz: e51b2679cd21202663a487eb937657b20f8db223a1e4d04f8bce32fb949fd7a505de5e1b09cad4b374b76d945e7923af73b5aa8bfb5484abce2833f6937ae7a0

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+## 0.1.3 - 2013-11-23
+
+* Specify branches when pulling and pushing to origin.
+* Abort script if pull request branch is master.
+
 ## 0.1.2 - 2013-11-14
 
 * Force delete local pull request branch if it's been rebased.

data/git_pretty_accept.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'git'
-  spec.add_dependency('methadone', '~> 1.3.1')
+  spec.add_dependency 'methadone', '~> 1.3.1'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency('rdoc')
-  spec.add_development_dependency('debugger')
-  spec.add_development_dependency('rake', '~> 0.9.2')
-  spec.add_development_dependency('rspec')
-  spec.add_development_dependency('rspec-example_steps')
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rdoc'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-example_steps'
 end

data/lib/git_pretty_accept/app.rb

@@ -4,28 +4,37 @@ module GitPrettyAccept
     include Methadone::CLILogging
 
     main do |branch|
-      options[:edit] = true if options[:edit].nil?
-
-      our = Git.open('.')
-      source_branch = our.branches.find(&:current).to_s
-
-      commands = [
-        "git pull",
-        "git checkout #{branch}",
-        "git rebase #{source_branch}",
-        "git checkout #{source_branch}",
-        "git merge --no-ff #{options[:edit] ? '--edit' : '--no-edit'} #{branch}",
-        "git push",
-        "git branch -D #{branch}",
-        "git push origin :#{branch}"
-      ]
-
-      commands.each_with_index do |command, i|
-        puts "\n#{command}"
-        unless system(command)
-          puts "\nDue to the error above, the following commands were not executed: "
-          puts commands[i + 1, commands.size].join("\n")
-          exit!
+      if branch == 'master'
+        error "You're trying to accept master as a pull request branch. " +
+          "Please checkout to master instead and accept this branch " +
+          "from there."
+        exit!
+      else
+        options[:edit] = true if options[:edit].nil?
+
+        our = Git.open('.')
+        source_branch = our.branches.find(&:current).to_s
+
+        commands = [
+          "git pull origin #{source_branch}",
+          "git checkout #{branch}",
+          "git rebase origin/#{source_branch}",
+          "git push --force origin #{branch}",
+          "git checkout #{source_branch}",
+          "git merge --no-ff #{options[:edit] ? '--edit' : '--no-edit'} #{branch}",
+          "git push origin #{source_branch}",
+          "git branch -D #{branch}",
+          "git push origin :#{branch}"
+        ]
+
+        commands.each_with_index do |command, i|
+          info "\n#{command}"
+          unless system(command)
+            error "\nDue to the error above, " +
+              "the following commands were not executed: " +
+              commands[i + 1, commands.size].join("\n")
+            exit!
+          end
         end
       end
     end

data/lib/git_pretty_accept/version.rb

@@ -1,3 +1,3 @@
 module GitPrettyAccept
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/git_pretty_accept/app_spec.rb

@@ -56,7 +56,7 @@ describe GitPrettyAccept::App do
 
     When 'I run `git pretty-accept PR_BRANCH`' do
       FileUtils.cd(our_path) do
-        `#{project_path}/bin/git-pretty-accept --no-edit #{pr_branch}`
+        `bundle exec #{project_path}/bin/git-pretty-accept --no-edit #{pr_branch}`
         expect($CHILD_STATUS.exitstatus).to eq(0)
       end
     end
@@ -67,10 +67,10 @@ describe GitPrettyAccept::App do
       expect(our.log[0].message).to eq("Merge branch 'pr_branch'")
       expect(our.log[0].parents.size).to eq(2)
 
-      expect(our.log[1].message).to eq('Add changelog')
+      expect(our.log[1].message).to eq('Update readme')
       expect(our.log[1].parents.size).to eq(1)
 
-      expect(our.log[2].message).to eq('Update readme')
+      expect(our.log[2].message).to eq('Add changelog')
       expect(our.log[2].parents.size).to eq(1)
 
       expect(our.log[3].message).to eq('Add readme')
@@ -90,4 +90,23 @@ describe GitPrettyAccept::App do
       expect(our.branches["origin/#{pr_branch}"]).to be_nil
     end
   end
+
+  Steps "should not allow master to be accepted as a PR branch" do
+    Given 'I have a local repo' do
+      Git.init(our_path)
+    end
+
+    When 'I run `git pretty-accept master`' do
+      command = "bundle exec #{project_path}/bin/git-pretty-accept --no-edit master"
+      FileUtils.cd(our_path) do
+        @result = system(command, err: '/tmp/err.log')
+      end
+    end
+
+    Then 'I should be informed that master cannot be accepted as a PR branch' do
+      expect(@result).to be_false
+      expect(File.read('/tmp/err.log')).to include(
+        'trying to accept master as a pull request branch')
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'debugger'
+require 'pry'
 require 'git_pretty_accept'
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,145 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: git_pretty_accept
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: git
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
-    none: false
-  prerelease: false
-  name: methadone
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  prerelease: false
-  name: bundler
-  type: :development
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: rdoc
-  type: :development
 - !ruby/object:Gem::Dependency
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: debugger
-  type: :development
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
-    none: false
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
-    none: false
-  prerelease: false
-  name: rake
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: rspec
-  type: :development
 - !ruby/object:Gem::Dependency
+  name: rspec-example_steps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: rspec-example_steps
-  type: :development
-description: ! ' `git-pretty-accept` is a script that rebases a pull request before
+description: ' `git-pretty-accept` is a script that rebases a pull request before
   merging to master. Pull requests are _always_ merged recursively. The result is
   a linear history with merge bubbles indicating pull requests. In short, pretty. '
 email:
@@ -165,33 +148,26 @@ files:
 homepage: https://github.com/gsmendoza/git_pretty_accept
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 150844083
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 150844083
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Accept pull requests, the pretty way
 test_files:
 - spec/git_pretty_accept/app_spec.rb