gitcycle 0.2.22 → 0.2.23

data/features/steps/gitcycle_steps.rb

@@ -30,6 +30,14 @@ Before do |scenario|
   $input = []
   $remotes = nil
   $ticket = nil
+
+  File.open("#{BASE}/features/fixtures/gitcycle.yml", 'w') do |f|
+    yaml = {
+      "#{config['user']}/#{config['repo']}" => [ config['user'], config['token_dev'] ],
+      "#{config['owner']}/#{config['repo']}" => [ config['user'], config['token_qa'] ],
+    }
+    f.write(YAML.dump(yaml))
+  end
 end
 
 def branches(options={})
@@ -332,9 +340,11 @@ Then /^redis entries valid$/ do
   }
   should['collab'] = '1' if collab
   if @scenario_title.include?("(Discuss)") && @scenario_title.include?("something committed")
-    should['labels'] = 'Branch - master'
+    should['labels'] = "Branch - master"
     should['issue_url'] = $github_url
+    should['state'] = 'open'
   end
+
   branch.should == should
 end
 

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.22'
+  s.version     = '0.2.23'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -135,36 +135,50 @@ class Gitcycle
     else
       remote, branch = args[0].split('/')
       remote, branch = nil, remote if branch.nil?
+      collab = branch && remote
 
       unless branches(:match => branch)
-        collab = branch && remote
+        og_remote = nil
 
-        unless collab
-          puts "\nRetrieving repo information from gitcycle.\n".green
-          repo = get('repo')
-          remote = repo['owner']
-        end
+        puts "\nRetrieving repo information from gitcycle.\n".green
+        repo = get('repo')
+        remote = repo['owner'] unless collab
         
-        add_remote_and_fetch(
+        output = add_remote_and_fetch(
           :owner => remote,
           :repo => @git_repo
         )
+
+        if output.include?('ERROR')
+          og_remote = remote
+          remote = repo["owner"]
+
+          add_remote_and_fetch(
+            :owner => remote,
+            :repo => @git_repo
+          )
+        end
         
         puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
-        run("git branch --no-track #{branch} #{remote}/#{branch}")
-
-        if collab
-          puts "Sending branch information to gitcycle.".green
-          get('branch',
-            'branch[home]' => remote,
-            'branch[name]' => branch,
-            'branch[source]' => branch,
-            'branch[collab]' => 1,
-            'create' => 1
-          )
+        output = run("git branch --no-track #{branch} #{remote}/#{branch}")
+
+        if output.include?("fatal")
+          puts "Could not find branch #{"'#{og_remote}/#{branch}' or " if og_remote}'#{remote}/#{branch}'.\n".red
+          exit
         end
       end
 
+      if collab
+        puts "Sending branch information to gitcycle.".green
+        get('branch',
+          'branch[home]' => remote,
+          'branch[name]' => branch,
+          'branch[source]' => branch,
+          'branch[collab]' => 1,
+          'create' => 1
+        )
+      end
+
       puts "Checking out '#{branch}'.\n".green
       run("git checkout -q #{branch}")
     end
@@ -841,7 +855,7 @@ class Gitcycle
     if ENV['RUN'] == '0'
       puts cmd
     else
-      `#{cmd}`
+      `#{cmd} 2>&1`
     end
   end
 

metadata

@@ -1,149 +1,152 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitcycle
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.2.23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 22
-  version: 0.2.22
 platform: ruby
-authors: 
+authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-09 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: lighthouse
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lighthouse
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 0
-        - 5
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Tame your development cycle.
-email: 
+email:
 - mail@wintoni.us
-executables: 
+executables:
 - gitc
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -166,41 +169,31 @@ files:
 - gitcycle.gemspec
 - lib/ext/string.rb
 - lib/gitcycle.rb
-has_rdoc: true
 homepage: https://github.com/winton/gitcycle
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tame your development cycle
-test_files: 
+test_files:
 - features/branch.feature
 - features/checkout.feature
 - features/config/config.example.yml