git_reflow 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 387fb2f3483c3e18b0bf7ba9073ae491b95c760a
-  data.tar.gz: 2390815525f3338aba546b0c7f54d5e5827c5d13
+  metadata.gz: 56b9d1f62f165da2fa44742c87666802d88b484d
+  data.tar.gz: df62b69368422f3fee100b6c0d95145321cd2215
 SHA512:
-  metadata.gz: eae7a39aec6c92600d8438e3d33d956a3212a1598c769e55d58b99f738e5f7567240e90f8887052f46408fe82237938e34ffc0ddff1697db554c669d616de07b
-  data.tar.gz: 29de749587d60ddcbf05fd7dbe4adaa89b7e05d8753860d130edc3fc859b8985e6104712fbc895fc4e2c146c6494bc4d389fd021742000d8e569293ae87e047f
+  metadata.gz: c64744638a2767e4a3b24877a7b5dc61506715d6cb729665b91f3460c5731a1f918f84c6258e7c14b85e1830135a3b2f87318ae36c04122fa856914d63c3a50c
+  data.tar.gz: b1f37dd0b8db8c3e554d643d0e94e3b39942ea0e7a081f1fe4f7beea0c105cc652478543ab1ba9da0d52b73044ccefd633b034d816b37c9db00deefa35db9140

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.4.1)
+    git_reflow (0.4.2)
       colorize (= 0.6.0)
-      github_api (= 0.12.2)
+      github_api (= 0.12.3)
       gli (= 2.12.2)
       highline
       httpclient
@@ -26,9 +26,9 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    github_api (0.12.2)
+    github_api (0.12.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
@@ -37,19 +37,19 @@ GEM
       nokogiri (~> 1.6.3)
       oauth2
     gli (2.12.2)
-    hashie (3.3.1)
+    hashie (3.4.0)
     highline (1.6.21)
-    httpclient (2.5.1)
+    httpclient (2.6.0.1)
     json (1.7.5)
-    json_pure (1.8.1)
-    jwt (1.0.0)
+    json_pure (1.8.2)
+    jwt (1.2.1)
     method_source (0.8.2)
-    mini_portile (0.6.0)
+    mini_portile (0.6.2)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -63,7 +63,7 @@ GEM
     pry-byebug (2.0.0)
       byebug (~> 3.4)
       pry (~> 0.10)
-    rack (1.5.2)
+    rack (1.6.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/README.rdoc

@@ -2,6 +2,8 @@
 
 http://www.reenhanced.com/images/reflow.png
 
+
+
 If your workflow looks like this:
 1. Create a feature branch
 2. Write great code

data/git_reflow.gemspec

@@ -31,7 +31,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('json_pure')
-  s.add_dependency('github_api', '0.12.2')
+  s.add_dependency('github_api', '0.12.3')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"
 end

data/lib/git_reflow/git_helpers.rb

@@ -7,12 +7,12 @@ module GitReflow
 
     def remote_user
       return "" unless "#{GitReflow::Config.get('remote.origin.url')}".length > 0
-      GitReflow::Config.get('remote.origin.url')[/[\/:](\w|-|\.)+/i][1..-1]
+      extract_remote_user_and_repo_from_remote_url(GitReflow::Config.get('remote.origin.url'))[:user]
     end
 
     def remote_repo_name
       return "" unless "#{GitReflow::Config.get('remote.origin.url')}".length > 0
-      GitReflow::Config.get('remote.origin.url')[/\/(\w|-|\.)+$/i][1..-5]
+      extract_remote_user_and_repo_from_remote_url(GitReflow::Config.get('remote.origin.url'))[:repo]
     end
 
     def current_branch
@@ -61,5 +61,22 @@ module GitReflow
       run "echo \"#{message}\" | cat - .git/SQUASH_MSG > ./tmp_squash_msg"
       run 'mv ./tmp_squash_msg .git/SQUASH_MSG'
     end
+    
+    private
+
+    def extract_remote_user_and_repo_from_remote_url(remote_url)
+      result = { user: '', repo: '' }
+      return result unless "#{remote_url}".length > 0
+
+      if remote_url =~ /\Agit@/i
+        result[:user] = remote_url[/[\/:](\w|-|\.)+/i][1..-1]
+        result[:repo] = remote_url[/\/(\w|-|\.)+$/i][1..-5]
+      elsif remote_url =~ /\Ahttps?/i
+        result[:user] = remote_url.split('/')[-2]
+        result[:repo] = remote_url.split('/')[-1].gsub(/.git\Z/i, '')
+      end
+
+      result
+    end
   end
 end

data/lib/git_reflow/git_server/git_hub.rb

@@ -53,6 +53,8 @@ module GitReflow
               config.ssl        = {:verify => false}
             end
 
+            @connection.connection_options = {headers: {"X-GitHub-OTP" => options[:two_factor_auth_code]}} if options[:two_factor_auth_code]
+
             previous_authorizations = @connection.oauth.all.select {|auth| auth.note == "git-reflow (#{run('hostname', loud: false).strip})" }
             if previous_authorizations.any?
               authorization = previous_authorizations.last
@@ -61,33 +63,11 @@ module GitReflow
             end
 
             self.class.oauth_token = authorization.token
-            puts "\nYour GitHub account was successfully setup!"
 
           rescue ::Github::Error::Unauthorized => e
             if e.inspect.to_s.include?('two-factor')
-              two_factor_code         = ask("Please enter your two-factor authentication code: ")
-              github_authorizations   = @connection.oauth.class.new(
-                basic_auth: "#{gh_user}:#{gh_password}",
-                endpoint:   GitServer::GitHub.api_endpoint,
-                site:       GitServer::GitHub.site_url,
-                ssl:        {:verify => false},
-                headers:    { "X-GitHub-OTP" => two_factor_code }
-              )
-
-              previous_authorizations = github_authorizations.all.select {|auth|
-                auth.note == "git-reflow (#{run('hostname', loud: false).strip})"
-              }
-
-              self.class.user = gh_user
-
-              if previous_authorizations.any?
-                authorization = previous_authorizations.last
-              else
-                authorization = github_authorizations.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
-              end
-
-              self.class.oauth_token = authorization.token
-              puts "\nYour GitHub account was successfully setup!"
+              two_factor_code = ask("Please enter your two-factor authentication code: ")
+              self.authenticate options.merge({user: gh_user, password: gh_password, two_factor_auth_code: two_factor_code})
             else
               puts "\nGithub Authentication Error: #{e.inspect}"
             end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -23,6 +23,11 @@ describe GitReflow::GitHelpers do
       let(:origin_url) { nil }
       it { should == '' }
     end
+
+    context "remote origin uses HTTP" do
+      let(:origin_url) { 'https://github.com/reenhanced.spectacular/this-is-the.shit.git' }
+      it               { should == 'reenhanced.spectacular' }
+    end
   end
 
   describe ".remote_repo_name" do
@@ -34,6 +39,11 @@ describe GitReflow::GitHelpers do
       let(:origin_url) { nil }
       it { should == '' }
     end
+
+    context "remote origin uses HTTP" do
+      let(:origin_url) { 'https://github.com/reenhanced.spectacular/this-is-the.shit.git' }
+      it               { should == 'this-is-the.shit' }
+    end
   end
 
   describe ".current_branch" do

data/spec/lib/git_server/git_hub_spec.rb

@@ -148,7 +148,7 @@ describe GitReflow::GitServer::GitHub do
         end
 
         it "notifies user of invalid login details" do
-          expect { subject }.to have_output "\nInvalid username or password: #{Github::Error::Unauthorized.new(unauthorized_error_response).inspect}"
+          expect { subject }.to have_output "\nGithub Authentication Error: #{Github::Error::Unauthorized.new(unauthorized_error_response).inspect}"
         end
       end
     end

data/spec/support/github_helpers.rb

@@ -71,15 +71,15 @@ module GithubHelpers
         to_return(:body => pull.to_s, :status => 201, :headers => {:content_type => "application/json\; charset=utf-8"})
 
       # Stubbing pull request finder
-      stub_get("/repos/#{user}/pulls").with(:query => {'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
+      stub_get("/repos/#{user}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
         to_return(:body => fixture('pull_requests/pull_requests.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
+      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
         to_return(:body => fixture('pull_requests/pull_requests.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       # Stubbing pull request comments
-      stub_get("/repos/#{user}/pulls/#{pull[:number]}/comments?").
+      stub_get("/repos/#{user}/pulls/#{pull[:number]}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
         to_return(:body => fixture('pull_requests/comments.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       # Stubbing issue comments
-      stub_get("/repos/#{user}/issues/#{pull[:number]}/comments?").
+      stub_get("/repos/#{user}/issues/#{pull[:number]}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
         to_return(:body => fixture('issues/comments.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,14 +172,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 description: Git Reflow manages your git workflow.
 email:
 - dev@reenhanced.com
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A better git process