git_reflow 0.2.5 → 0.3.1

metadata

@@ -1,204 +1,153 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: git_reflow
-version: !ruby/object:Gem::Version
-  version: 0.2.5
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
-authors:
+authors: 
 - Valentino Stoll
 - Robert Stern
 - Nicholas Hance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+
+date: 2013-07-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: rake
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  name: rdoc
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.6
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.6
-- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 5
+        - 8
         version: 0.5.8
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.8
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  name: colorize
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  name: gli
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_api
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   type: :runtime
+  name: highline
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  type: :runtime
+  name: httpclient
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
+  prerelease: false
+  type: :runtime
+  name: github_api
+  requirement: *id008
 description: Git Reflow manages your git workflow.
-email:
+email: 
 - dev@reenhanced.com
-executables:
+executables: 
 - git-reflow
 - gitreflow-common
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -206,15 +155,6 @@ files:
 - Rakefile
 - bin/git-reflow
 - bin/gitreflow-common
-- features/step_definitions/debug_steps.rb
-- features/step_definitions/gem_steps.rb
-- features/step_definitions/git_steps.rb
-- features/support/env.rb
-- features/support/gem.rb
-- features/support/github_helpers.rb
-- features/user_delivers_flow.feature
-- features/user_installs_gem.feature
-- features/user_starts_flow.feature
 - git_reflow.gemspec
 - lib/git_reflow.rb
 - lib/git_reflow/base.rb
@@ -224,69 +164,45 @@ files:
 - lib/git_reflow/commands/start.rb
 - lib/git_reflow/commands/status.rb
 - lib/git_reflow/version.rb
-- spec/fixtures/git/git_config
-- spec/fixtures/pull_requests/pull_request.json
-- spec/fixtures/pull_requests/pull_request_exists_error.json
-- spec/fixtures/pull_requests/pull_requests.json
-- spec/git_reflow_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures.rb
-- spec/support/github_helpers.rb
-- spec/support/web_mocks.rb
 homepage: http://github.com/reenhanced/gitreflow
 licenses: []
-post_install_message: ! 'You need to setup your GitHub OAuth token
 
-  Please run ''git-reflow setup'''
-rdoc_options:
+post_install_message: |-
+  You need to setup your GitHub OAuth token
+  Please run 'git-reflow setup'
+rdoc_options: 
 - --title
 - git_reflow
 - --main
 - README.rdoc
 - -ri
-require_paths:
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3553381225246812940
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3553381225246812940
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A better git process
-test_files:
-- features/step_definitions/debug_steps.rb
-- features/step_definitions/gem_steps.rb
-- features/step_definitions/git_steps.rb
-- features/support/env.rb
-- features/support/gem.rb
-- features/support/github_helpers.rb
-- features/user_delivers_flow.feature
-- features/user_installs_gem.feature
-- features/user_starts_flow.feature
-- spec/fixtures/git/git_config
-- spec/fixtures/pull_requests/pull_request.json
-- spec/fixtures/pull_requests/pull_request_exists_error.json
-- spec/fixtures/pull_requests/pull_requests.json
-- spec/git_reflow_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures.rb
-- spec/support/github_helpers.rb
-- spec/support/web_mocks.rb
+test_files: []
+

data/features/step_definitions/debug_steps.rb

@@ -1,4 +0,0 @@
-When /^I debug$/ do
-  debugger
-end
-

data/features/step_definitions/gem_steps.rb

@@ -1,3 +0,0 @@
-When /^I build and install the gem$/ do
-  CukeGem.setup('./git_reflow.gemspec')
-end

data/features/step_definitions/git_steps.rb

@@ -1,138 +0,0 @@
-Given /^I have a git repository with a branch named "([^"]+)" checked out$/ do |branch_name|
-  steps %{
-    Given a directory named "master_repo"
-    And I cd to "master_repo"
-    And I write to "README" with:
-      | Initialized |
-    And I successfully run `git init`
-    And I successfully run `git add README`
-    And I successfully run `git commit -m "Initial commit"`
-  }
-
-  unless branch_name == "master"
-    steps %{
-      And I successfully run `git checkout -b #{branch_name}`
-    }
-  end
-
-  steps %{
-    And I cd to ".."
-  }
-end
-
-Given /^I have a remote git repository named "([^"]+)"$/ do |remote_name|
-  steps %{
-    Given a directory named "#{remote_name}_repo"
-    When I cd to "#{remote_name}_repo"
-    And I successfully run `git init`
-    And I write to "README" with:
-      | Initialized |
-    And I successfully run `git add .`
-    And I successfully run `git commit -am "Initial commit"`
-    And I cd to ".."
-    And I cd to "master_repo"
-    And I successfully run `git remote add #{remote_name} ../#{remote_name}_repo`
-    And I cd to ".."
-  }
-end
-
-Given /^the remote repository named "([^"]+)" has changes on the "([^"]+)" branch$/ do |remote_name, branch_name|
-  steps %{
-    Given a directory named "#{remote_name}_repo"
-    When I cd to "#{remote_name}_repo"
-    And I successfully run `git checkout #{branch_name}`
-    And I append to "README" with:
-      | changed |
-    And I successfully run `git add .`
-    And I successfully run `git commit -am "Changed readme"`
-    And I cd to ".."
-  }
-end
-
-Given /^the repository has been initialized$/ do
-  steps %{
-    Given I successfully run `git branch`
-    Then the output should contain "master"
-  }
-end
-
-Given /^I have a new branch named "([^"]+)" checked out$/ do |branch_name|
-  steps %{
-    When I cd to "master_repo"
-    And I successfully run `git checkout -b #{branch_name}`
-  }
-end
-
-Given /^I have a reviewed feature branch named "([^"]+)" checked out$/ do |branch_name|
-  pull = {
-    "title" => "Amazing new feature",
-    "body"  => "Please pull this in!",
-    "head"  => "reenhanced:#{branch_name}",
-    "base"  => "master",
-    "state" => "open"
-  }
-  stub_github_with(
-    :user => 'reenhanced',
-    :repo => 'repo',
-    :branch => branch_name,
-    :pull => pull
-  )
-
-  review_options = {
-    'base'  => pull['base'],
-    'title' => pull['title'],
-    'body'  => pull['body']
-  }
-
-  GitReflow.review review_options
-
-  # ensure we do not stay inside the remote repo
-  steps %{
-    Given I cd to ".."
-  }
-end
-
-When /^I deliver my "([^"]+)" branch$/ do |branch_name|
-  pull = {
-    "title" => "Amazing new feature",
-    "body"  => "Please pull this in!",
-    "head"  => "reenhanced:#{branch_name}",
-    "base"  => "master",
-    "state" => "open"
-  }
-  stub_github_with(
-    :user => 'reenhanced',
-    :repo => 'repo',
-    :branch => branch_name,
-    :pull => pull
-  )
-  GitReflow.deliver
-  GitReflow.stub(:current_branch).and_return("master")
-end
-
-Then /^a branch named "([^"]+)" should have been created from "([^"]+)"$/ do |new_branch, base_branch|
-  steps %{
-    Then the output should match /\\* \\[new branch\\]\\s* #{Regexp.escape(base_branch)}\\s* \\-\\> #{Regexp.escape(new_branch)}/
-  }
-end
-
-Then /^the base branch named "([^"]+)" should have fetched changes from the remote git repository "([^"]+)"$/ do |base_branch, remote_name|
-  steps %{
-    Then the output should match /\\* \\[new branch\\]\\s* #{Regexp.escape(base_branch)}\\s* \\-\\> #{remote_name}.#{Regexp.escape(base_branch)}/
-  }
-end
-
-Then /^the subcommand "([^"]+)" should run$/ do |subcommand|
-  has_subcommand?(subcommand).should be_true
-end
-
-Then /^the branch "([^"]+)" should be checked out$/ do |branch_name|
-  GitReflow.current_branch.should == branch_name
-end
-
-Then /^the branch "([^"]+)" should be up to date with the remote repository$/ do |branch_name|
-  steps %{
-    When I successfully run `git pull origin #{branch_name}`
-    Then the output should contain "Already up-to-date"
-  }
-end

data/features/support/env.rb

@@ -1,27 +0,0 @@
-require 'aruba/cucumber'
-require 'ruby-debug'
-require 'webmock/cucumber'
-require 'cucumber/rspec/doubles'
-
-Before('@gem') do
-  CukeGem.setup('./git_reflow.gemspec')
-end
-
-After('@gem') do
-  CukeGem.teardown
-end
-
-Before do
-  FileUtils.rm_rf Dir.glob("#{Dir.tmpdir}/aruba")
-end
-
-WebMock.disable_net_connect!
-
-def has_subcommand?(command)
-  # In order to see if a subcommand is run
-  # we have to look it up in Aruba's process list
-  # Aruba has a get_process helper, but it errors if none is found
-  # See: https://github.com/cucumber/aruba/blob/master/lib/aruba/api.rb#L239
-  found = processes.reverse.find{ |name, _| name == command }
-  found[-1] if found
-end

data/features/support/gem.rb

@@ -1,85 +0,0 @@
-# Thanks to:
-# Copyright 2011 Solano Labs All Rights Reserved
-# https://gist.github.com/1132465
-
-require 'aruba'
-require 'aruba/api'
-
-class CukeGem
-  @setup_done = false
-
-  class << self
-    include Aruba::Api
-
-    attr_reader :setup_done
-
-    def setup(gemspec, once=true)
-      gem_home = setup_env
-      if !@setup_done || !once then
-        @setup_done = true
-        mkgemdir(gem_home)
-        gem_install(gemspec)
-      end
-    end
-
-    def teardown
-      restore_env
-    end
-
-    def setup_env
-      tid = ENV['TDDIUM_TID'] || ''
-      gem_home = File.join(ENV['HOME'], 'tmp', 'aruba-gem')
-      gem_home = File.expand_path(gem_home)
-
-      set_env('GEM_HOME', gem_home)
-      set_env('GEM_PATH', gem_home)
-      set_env('BUNDLE_PATH', gem_home)
-      unset_bundler_env_vars
-
-      paths = (ENV['PATH'] || "").split(File::PATH_SEPARATOR)
-      paths.unshift(File.join(gem_home, 'bin'))
-      set_env('PATH', paths.uniq.join(File::PATH_SEPARATOR))
-
-      return gem_home
-    end
-
-    def mkgemdir(gem_home)
-      FileUtils::rm_rf(gem_home)
-      FileUtils::mkdir_p(gem_home)
-
-      output = `gem install bundler`
-      if $?.exitstatus != 0 then
-        raise "unable to install bundler into #{gem_home}: #{output}"
-      end
-    end
-
-    def gem_install(gemspec)
-      gem_file = nil
-      begin
-        pwd = Dir.pwd
-        gemspec_dir = File.dirname(gemspec)
-        Dir.chdir(gemspec_dir)
-        output = `gem build #{File.basename(gemspec)}`
-        Dir.chdir(pwd)
-
-        if $?.exitstatus != 0 then
-          raise "unable to build gem: #{output}"
-        end
-
-        if output =~ /File:\s+([A-Za-z0-9_.-]+[.]gem)/ then
-          gem_file = $1
-          output = `gem install #{File.join(gemspec_dir, gem_file)}`
-          if $?.exitstatus != 0 then
-            raise "unable to install gem: #{output}"
-          end
-        else
-          raise "garbled gem build output: #{output}"
-        end
-      ensure
-        if gem_file then
-          FileUtils.rm_f(File.join(gemspec_dir, gem_file))
-        end
-      end
-    end
-  end
-end

data/features/support/github_helpers.rb

@@ -1,3 +0,0 @@
-require File.expand_path('../../../spec/support/github_helpers', __FILE__)
-
-World(GithubHelpers)