travis 1.8.1.travis.713.4 → 1.8.1.travis.717.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDVmZDgzOWQ0YTg5MDM5ZDg2YTZhNzY4NzBjMDhiYjc0ODMyZmYwZg==
+    ZDJlYjIwZDc3NzJkZWViOTdlNGU4NzJmNjE2MmI1Njc0MGFjN2VjOA==
   data.tar.gz: !binary |-
-    ZDU0NDUzYTdiNzljNGM3NTQ3M2YxMzFjNTU2YmUzN2Y0MmFjZDc4Mg==
+    MzQ3MGZiOGFlYjhhZWFlMjUwMDMzNDNmZjU3ZGFmMjVhNTExMWRhOA==
 SHA512:
   metadata.gz: !binary |-
-    NTM0NmYzYmY4MzFjNzkzZjA3ZWQ2N2MxYmM2MDViMzliZjM5NmRiOTM2Y2E4
-    ZjM2YTQ2NWNkODM0MmNkMzRhODZkMTkxNzdjZTAzYTIxODE3M2JkNzVlYWU1
-    MzcyZWU1M2Y0Mjc1MjUyMjllOWU3NjliZTM0NjI1MWVmM2FjNWE=
+    YjAyNTk5YjZhYTA5NzU2YmU2NmVjMjVmNjZmOTRjYTdhNzc5ZDM1YWYxMTEx
+    YTYxMmEzNGQ3ODM5MjVkNGQxNGFmNjgwNTIwZDMwMGExYWE4N2QzYzcxODAw
+    YjczMjZhYzk3ZDAwYThkYzI3ZGI3NGI5N2RhYTJjZGYzMmMxYjY=
   data.tar.gz: !binary |-
-    M2NhY2MyMDQwNzBmMWFiNGM2YjVhNDcyNjQxNmQyM2Q0ODAxYzc4NDk0YmE0
-    NWIzMTFjYzQyMGRjZDViYTE1NWEzOWMyOGQzNDJiNGQ3Y2QwYmE3ZDA1YTRh
-    ZDk1YTc5MmRlZTA3YmQ4NjhkZjBlNjEyYmFiMjU3Yjc3MzYzMzM=
+    NTllODljZWI5NTljOWY1NjYyNzMxODU1OGJjMGM5MjQ5NmFiMmU3M2JlYTEz
+    NmI0NjdmM2E2OTFhN2E0NzFkYTM1N2E1ZTVhZjE5YWFkNzkwOGY0OTgzNmI0
+    NjBmOTdmYTE4NmViMTIzZjMwN2UwMjkyNjk4NDAxZjEzYWYxYzk=

data/lib/travis/cli/repo_command.rb

@@ -1,6 +1,5 @@
 require 'travis/cli'
 require 'yaml'
-require "addressable/uri"
 
 module Travis
   module CLI
@@ -68,7 +67,7 @@ module Travis
           git_remote  = 'origin' if git_remote.empty?
           git_info    = `git ls-remote --get-url #{git_remote} 2>#{IO::NULL}`.chomp
 
-          if Addressable::URI.parse(git_info).path =~ GIT_REGEX
+          if parse_remote(git_info) =~ GIT_REGEX
             detectected_slug = $1
             if interactive?
               if agree("Detected repository as #{color(detectected_slug, :info)}, is this correct? ") { |q| q.default = 'yes' }
@@ -83,6 +82,16 @@ module Travis
           end
         end
 
+        def parse_remote(url)
+          if url =~ /^git@[^:]+:/
+            path = url.split(':').last
+            path = "/#{path}" unless path.start_with?('/')
+            path
+          else
+            URI.parse(url).path
+          end
+        end
+
         def load_slug
           stored = `git config --get travis.slug`.chomp
           stored unless stored.empty?

data/spec/cli/repo_command_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'uri'
+
+describe Travis::CLI::RepoCommand do
+  describe '#parse_remote' do
+    it 'handles git@github.com URIs' do
+      path = subject.send(:parse_remote, 'git@github.com:travis-ci/travis.rb.git')
+      path.should be == '/travis-ci/travis.rb.git'
+    end
+
+    it 'handles GitHub Enterprise URIS' do
+      path = subject.send(:parse_remote, 'git@example.com:travis-ci/travis.rb.git')
+      path.should be == '/travis-ci/travis.rb.git'
+    end
+
+    it 'handles HTTPS URIs' do
+      path = subject.send(:parse_remote, 'https://github.com/travis-ci/travis.rb.git')
+      path.should be == '/travis-ci/travis.rb.git'
+    end
+
+    it 'raises URI::InvalidURIError for invalid URIs' do
+      expect { subject.send(:parse_remote, "foo@example.com:baz/bar.git") }.to raise_error(URI::InvalidURIError)
+    end
+  end
+end

data/travis.gemspec

@@ -260,6 +260,7 @@ Gem::Specification.new do |s|
     "spec/cli/login_spec.rb",
     "spec/cli/logs_spec.rb",
     "spec/cli/open_spec.rb",
+    "spec/cli/repo_command_spec.rb",
     "spec/cli/restart_spec.rb",
     "spec/cli/setup_spec.rb",
     "spec/cli/show_spec.rb",
@@ -299,7 +300,6 @@ Gem::Specification.new do |s|
   s.add_dependency "launchy",               "~> 2.1"
   s.add_dependency "typhoeus",              "~> 0.6", ">= 0.6.8"
   s.add_dependency "pusher-client",         "~> 0.4"
-  s.add_dependency "addressable",           "~> 2.3"
   s.add_development_dependency "rspec",     "~> 2.12"
   s.add_development_dependency "sinatra",   "~> 1.3"
   s.add_development_dependency "rack-test", "~> 0.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.8.1.travis.713.4
+  version: 1.8.1.travis.717.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -50,7 +50,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -176,20 +176,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -437,6 +423,7 @@ files:
 - spec/cli/login_spec.rb
 - spec/cli/logs_spec.rb
 - spec/cli/open_spec.rb
+- spec/cli/repo_command_spec.rb
 - spec/cli/restart_spec.rb
 - spec/cli/setup_spec.rb
 - spec/cli/show_spec.rb