git_go 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_go (0.1.1)
+    git_go (0.1.2)
       net-ssh (~> 2.6.2)
       thor (~> 0.16.0)
 

data/lib/git_go/version.rb

@@ -3,6 +3,6 @@
 module GitGo
 
   # @return [String] the current GitGo version.
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 

data/lib/git_go.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 
+require "uri"
+
 require "rubygems"
 require "thor"
 require "net/ssh"
@@ -25,14 +27,36 @@ module GitGo
     #
     # @return [GitGo::Core] an instance of GitGo::Core
     def initialize
-      @user = ENV["GIT_GO_USER"]
-      @host = ENV["GIT_GO_HOST"]
+      if ENV["GIT_GO_URI"].nil?
+        puts
+        puts "GIT_GO_URI not set."
+        puts "Run `gg instructions` for more details."
+        puts
+        puts "NOTE"
+        puts
+        puts "GIT_GO_USER and GIT_GO_HOST have been removed."
+        puts "Please use GIT_GO_URI instead. For example:"
+        puts
+        puts "  export GIT_GO_URI=git@repositories.example.com"
+        puts
+        puts "Or with a static IP:"
+        puts
+        puts "  export GIT_GO_URI=git@207.97.227.239"
+        puts
+        return exit(1)
+      end
 
-      if [user, host].include?(nil)
-        puts "GIT_GO_USER and GIT_GO_HOST not set."
+      begin
+        uri = URI.parse("ssh://#{ENV["GIT_GO_URI"]}")
+      rescue URI::InvalidURIError
+        puts
+        puts "Your GIT_GO_URI (#{ENV["GIT_GO_URI"]}) is invalid."
         puts "Run `gg instructions` for more details."
-        exit(1)
+        puts
+        return exit(1)
       end
+
+      @user, @host = uri.user, uri.host
     end
 
     # Creates and returns a new instance of GitGo::Connection.

data/spec/lib/git_go/connection/remote_spec.rb

@@ -9,8 +9,7 @@ describe GitGo::Connection::Remote do
   let(:ssh)  { mock("Net::SSH")                    }
 
   before do
-    ENV["GIT_GO_USER"] = "git"
-    ENV["GIT_GO_HOST"] = "192.168.1.1" # Remote IP
+    ENV["GIT_GO_URI"] = "git@192.168.1.1" # remote ip
     Net::SSH.stubs(:start).returns(ssh)
   end
 

data/spec/lib/git_go_spec.rb

@@ -2,27 +2,32 @@
 
 require "spec_helper"
 
-describe GitGo do
+describe GitGo::Core do
   it "should exit when initializing without the environment variables" do
-    ENV["GIT_GO_USER"] = nil
-    ENV["GIT_GO_HOST"] = nil
+    ENV["GIT_GO_URI"] = nil
 
+    GitGo::Core.any_instance.stubs(:puts).times(15)
+    GitGo::Core.any_instance.expects(:exit).with(1)
+    GitGo::Core.new
+  end
+
+  it "should exit on invalid URIs" do
+    ENV["GIT_GO_URI"] = ""
+
+    GitGo::Core.any_instance.stubs(:puts).times(4)
     GitGo::Core.any_instance.expects(:exit).with(1)
-    GitGo::Core.any_instance.stubs(:puts)
     GitGo::Core.new
   end
 
   it "should not exit when initializing with the environment variables" do
-    ENV["GIT_GO_USER"] = "git"
-    ENV["GIT_GO_HOST"] = "127.0.0.1"
+    ENV["GIT_GO_URI"] = "git@127.0.0.1"
 
     GitGo::Core.any_instance.expects(:exit).never
     GitGo::Core.new
   end
 
   it "should initialize a GitGo::Connection::Remote connection" do
-    ENV["GIT_GO_USER"] = "git"
-    ENV["GIT_GO_HOST"] = "192.168.1.1"
+    ENV["GIT_GO_URI"] = "git@192.168.1.1"
 
     core = GitGo::Core.new
     GitGo::Connection::Remote.expects(:new).with(core)
@@ -31,8 +36,7 @@ describe GitGo do
   end
 
   it "should initialize a GitGo::Connection::Local connection" do
-    ENV["GIT_GO_USER"] = "git"
-    ENV["GIT_GO_HOST"] = "127.0.0.1"
+    ENV["GIT_GO_URI"] = "git@127.0.0.1"
 
     core = GitGo::Core.new
     GitGo::Connection::Local.expects(:new).with(core)

data/spec/spec_helper.rb

@@ -13,8 +13,7 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.before do
-    ENV["GIT_GO_USER"] = "git"
-    ENV["GIT_GO_HOST"] = "127.0.0.1" # localhost
+    ENV["GIT_GO_URI"] = "git@127.0.0.1" # localhost
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_go
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3457378250373614310
+      hash: -3903107512716536942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3457378250373614310
+      hash: -3903107512716536942
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23