francois-gip 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/features/import.feature

@@ -5,8 +5,8 @@ Feature: Importing a repository
 
   Scenario: Importing into an existing repository
     Given a project
-    And a vendor project named 'libcalc'
-    When I run 'gip import __libcalc__ vendor/libcalc'
+    And a vendor project named "libcalc"
+    When I run "gip import __libcalc__ vendor/libcalc"
     Then I should see "Imported __libcalc__ into vendor/libcalc"
-    And the file '.gipinfo' should contain 'vendor/libcalc,__libcalc__'
+    And the file ".gipinfo" should contain "vendor/libcalc,__libcalc__"
     And the working copy should be clean

data/features/step_definitions/gip_steps.rb

@@ -1,12 +1,42 @@
 Given /^a project$/ do
-  @project_dir = Pathname.new(Dir.tmpdir) + "gip/#{Process.pid}/project-dir"
-  FileUtils::Verbose.rm_rf(@project_dir)
-  @project_dir.mkpath
-  Dir.chdir(@project_dir) do
-    sh "touch README", :verbose => true
+  Dir.chdir(project_dir) do
+    sh "cd #{project_dir}"
+    sh "touch README"
+    sh "git init"
+    sh "git add --all"
+    sh "git commit --message 'Initial commit'"
+    sh "ls -A"
+  end
+end
+
+Given /^a vendor project named "([^"]+)"$/ do |name|
+  vendor(name) do |path|
+    sh "cd #{path}"
+    sh "touch README"
+    sh "mkdir lib"
+    sh "touch lib/#{name}.rb"
     sh "git init", :verbose => true
     sh "git add --all", :verbose => true
     sh "git commit --message 'Initial commit'", :verbose => true
-    sh "ls -A", :verbose => true
+    sh "ls -lA", :verbose => true
+  end
+end
+
+When /^I run "gip import __([^_]+)__ ([^"]+)"$/ do |vendor, target|
+  Dir.chdir(project_dir) do
+    sh "gip import #{vendor_dirs[vendor]}/.git #{target}", :verbose => true
   end
+  pending
+end
+
+Then /^I should see "([^\"]*)"$/ do |arg1|
+  pending
+end
+
+Then /^the file '\.gipinfo' should contain 'vendor\/libcalc,__libcalc__'$/ do
+  pending
+end
+
+Then /^the working copy should be clean$/ do
+  pending
 end

data/features/support/env.rb

@@ -5,4 +5,32 @@ require "fileutils"
 
 require "test/unit/assertions"
 
+module GipHelpers
+  def project_dir
+    @project_dir ||= begin
+                       path = Pathname.new(Dir.tmpdir) + "gip/#{Process.pid}/project-dir"
+                       path.mkpath
+                       path
+                     end
+  end
+
+  def reset_vendors!
+    @vendor_dirs.values.each {|dir| dir.rmtree }
+    @vendor_dirs = Hash.new
+  end
+
+  def vendor_dirs
+    @vendor_dirs
+  end
+
+  def vendor(basename)
+    Pathname.new(Dir.tmpdir) / "gip" / Process.pid.to_s / basename
+  end
+end
+
+World(GipHelpers)
 World(Test::Unit::Assertions)
+
+Before do
+  reset_vendors!
+end

data/gip.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gip}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]
-  s.date = %q{2009-06-26}
+  s.date = %q{2009-07-13}
   s.default_executable = %q{gip}
   s.email = %q{francois@teksol.info}
   s.executables = ["gip"]

data/lib/gip.rb

@@ -21,7 +21,11 @@ In all cases, a .gipinfo file will be created/updated with the correct remotes s
 DESC
   method_options :commit => :optional, :remote => :optional, :verbose => 0
   def import(repository_url, path=nil)
-    uri  = URI.parse(repository_url)
+    uri  = begin
+             URI.parse(repository_url)
+           rescue URI::InvalidURIError
+             URI.parse("git://" + repository_url.split("@", 2).last)
+           end
     path = File.basename(uri.path).sub(File.extname(uri.path), "") unless path
     name = options[:remote]
     name = File.basename(uri.path).sub(File.extname(uri.path), "") unless name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-gip
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-26 00:00:00 -07:00
+date: 2009-07-13 00:00:00 -07:00
 default_executable: gip
 dependencies: []