gemrage 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/gemrage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gemrage}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]

data/lib/rubygems/commands/scan_command.rb

@@ -48,9 +48,9 @@ class Gem::Commands::ScanCommand < Gem::Command
 
   def execute
     if dir = get_one_optional_argument
-      notify(send_project_to_gemrage(project_scan(File.expand_path(dir))))
+      send_project_to_gemrage(project_scan(File.expand_path(dir)))
     else
-      notify(send_system_to_gemrage(system_scan))
+      send_system_to_gemrage(system_scan)
     end
   end
 
@@ -69,26 +69,30 @@ private
   end
 
   def project_scan(dir)
-    Dir[File.join(dir, '**', '{Gemfile}')].map do |gemfile|
-      project_name = File.basename(File.dirname(gemfile))
-      project_id = Digest::SHA1.hexdigest(File.dirname(gemfile))
+    h = {}
+    Dir[File.join(dir, '**', '{Gemfile,gemfile}')].each do |gemfile|
+      dir = File.dirname(gemfile)
+      notify("Trying to process a Gemfile found in #{dir}")
+      project_name = File.basename(dir)
+      project_id = Digest::SHA1.hexdigest(dir)
       lockfile = parse_lockfile("#{gemfile}.lock")
 
       begin
         d = Bundler::Definition.build(gemfile, nil, nil)
         deps = d.current_dependencies
-        {
+        info =  {
           :name => project_name,
-          :identifier => project_id,
           :gems => Hash[*deps.map do |dep|
             [dep.name, lockfile[dep.name] || dep.requirement.to_s]
           end.flatten]
         }
+        git_url = find_git_url(dir) and info[:origin] = Digest::SHA1.hexdigest(git_url.split.last)
+        h[project_id] = info
       rescue Exception => boom
         # Maybe it's an old Gemfile
-        nil
       end
-    end.compact
+    end
+    h
   end
 
   def parse_lockfile(lockfile)
@@ -109,20 +113,20 @@ private
 
   def system_scan
     if windows? && pik?
-      notify("Scanning with pik")
+      notify('Scanning with pik')
       pik_scan
     elsif !windows? && rvm? && !options[:force_basic]
       if :jruby == platform
-        notify("You are using jRuby and have RVM. Oh boy...",
+        notify('You are using jRuby and have RVM. Oh boy...',
                "We'd like to make use of RVM, but using RVM from jRuby is...interesting.",
                "We'll just do a basic scan, and you can rescan using a non-jRuby VM if you want RVM support.")
         basic_scan
       else
-        notify("Scanning with RVM...this might take a while")
+        notify('Scanning with RVM...this might take a while')
         rvm_scan
       end
     else
-      notify("Scanning with basic gem support")
+      notify('Scanning with basic gem support')
       basic_scan
     end
   end
@@ -212,6 +216,17 @@ private
     Digest::SHA1.hexdigest(Mac.addr)
   end
 
+  def find_git_url(wd)
+    Dir.chdir(wd) do
+      config = '.git/config'
+      if File.exists?(config)
+        lines = File.readlines(config).map { |line| line.strip }.join("\n").split('[remote "origin"]').last.strip.split("\n").select { |line| line =~ /^url/ }.first
+      else
+        nil
+      end
+    end
+  end
+
   def parse_gem_list(stdout, plat = platform)
     h = {}
     stdout.split("\n").each do |line|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gemrage
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Daniel Huckstep