repomap 0.0.10 → 0.0.11

data/bin/repo

@@ -94,12 +94,12 @@ begin
       RepoMap.handle(opts)
     end
   else
-    puts "repo: Not a known subcommand"
+    STDOUT.puts "repo: Not a known subcommand"
   end  
 
   exit 0
 rescue OptionParser::MissingArgument => e
-  puts "repo: #{e}"
+  STDERR.puts "repo: #{e}"
 rescue NoMethodError => e
-  puts banner
+  STDOUT.puts banner
 end

data/lib/repomap.rb

@@ -22,13 +22,13 @@ module RepoMap
   #                  :pattern => "some regex"}}
   #
   # Then, call appropriate functions.
-  def self.handle options
+  def self.handle(options)
     
     case options[:action].to_s
     when /add/
       if path_exists? options 
          add_recursive! options[:options][:path] if options[:options][:recursive]
-         add! options[:options][:path] if not options[:options][:recursive]  
+         add! options[:options][:path] if !(options[:options][:recursive])  
       end
     when /remove/
       if path_exists? options 
@@ -44,10 +44,10 @@ module RepoMap
 
   end
 
-  def path_exists? options
+  def path_exists?(options)
 
-    if options[:options][:path] != nil and
-       options[:options][:path] != ''
+    if (options[:options][:path] != nil) &&
+       (options[:options][:path] != '')
       return true
     else
       return false

data/lib/repomap/add.rb

@@ -1,7 +1,9 @@
+require 'find'
+
 module RepoMap
   
-  def add! path
-    if File.directory? path and has_git? path
+  def add!(path)
+    if File.directory?(path) && has_git?(path)
       full_path = File.expand_path(path)
       basename = File.basename(full_path)
       puts "repo: I'm adding '#{basename}' to '#{repo_map}'"
@@ -12,22 +14,14 @@ module RepoMap
     end
   end
 
-  def add_recursive! path
-    if File.directory?(path) and has_git?(path)
-      add! path
-    elsif File.directory?(path) and !has_git?(path)
-      Dir.foreach(path) do |item|
-        next if item == '.' or item == '..'
-        item_path = File.join(File.expand_path(path), item)
-        add_recursive! item_path if File.directory? item_path
-      end
-    else
-      STDERR.puts "repo: Not a directory or repository -- #{path}"
-      exit 1
+
+  def add_recursive!(path)
+    Find.find(path) do |f|
+      add! f if File.directory?(f) && has_git?(f)
     end
   end
 
-  def add_repo! reponame, full_path
+  def add_repo!(reponame, full_path)
     repo_map_validate
     hash = YAML::load(File.read(repo_map))
     hash = {} if hash==nil

data/lib/repomap/config.rb

@@ -1,9 +1,9 @@
 module RepoMap
 
-  ENV['REPO_MAP'] = "#{`echo $HOME`.chomp}/.repomap.yml"
+  REPO_MAP_FILE = File.join(ENV['HOME'].strip,".repomap.yml")
 
   def repo_map
-    ENV['REPO_MAP']
+    REPO_MAP_FILE
   end
 
 end

data/lib/repomap/find.rb

@@ -1,14 +1,14 @@
 module RepoMap
 
-  def find path, pattern
+  def find(path, pattern)
     if path
-      find_with_path path, pattern
+      find_with_path(path, pattern)
     else
-      find_without_path pattern
+      find_without_path(pattern)
     end
   end
 
-  def find_with_path path, pattern
+  def find_with_path(path, pattern)
     repo_map_validate
     hash = YAML::load(File.read(repo_map))
     regex = Regexp.new(pattern)
@@ -17,17 +17,17 @@ module RepoMap
     hash.each do |k, v|
       fk = File.expand_path(k.to_s)
       m = fk.match(fp_reg)
-      is_subdir = (fk.length>fp.length)&&(m.to_s==fp)
-      if is_subdir and v[:name].to_s.match(regex)!=nil
+      is_subdir = (fk.length>fp.length) && (m.to_s==fp)
+      if is_subdir && v[:name].to_s.match(regex)!=nil
         puts k.to_s
       end
     end
   end
 
-  def find_without_path pattern
+  def find_without_path(pattern)
     repo_map_validate
     hash = YAML::load(File.read(repo_map))
-    regex = Regexp.new pattern
+    regex = Regexp.new(pattern)
     hash.each do |k, v|
       if v[:name].to_s.match(regex)!=nil
         puts k.to_s

data/lib/repomap/helpers.rb

@@ -1,7 +1,5 @@
 module RepoMap
 
-  repo_map = ENV['REPO_MAP']
-
   def repo_map_validate
     unless repo_map_exists?
       File.new(repo_map, "w")
@@ -11,14 +9,14 @@ module RepoMap
     end
   end
 
-  def has_git? path
+  def has_git?(path)
     File.directory? "#{File.expand_path(path)}/.git"
   end
 
   def repo_map_exists?
     a = File.exist? repo_map
     b = File.read(repo_map)!='' if a
-    a and b
+    a && b
   end
 
 end

data/lib/repomap/list.rb

@@ -8,7 +8,7 @@ module RepoMap
      longest_name = v[:name].length if v[:name].length > longest_name 
     end
     hash.each do |key, value|
-     printf "%-#{longest_name}s %s\n", value[:name], key
+     printf("%-#{longest_name}s %s\n", value[:name], key)
     end
     exit 0
   end

data/lib/repomap/remove.rb

@@ -1,12 +1,12 @@
 module RepoMap
 
-  def remove! path
+  def remove!(path)
     repo_map_validate
     full_path = File.expand_path(path)
     basename = File.basename(full_path)
     hash = YAML::load(File.read(repo_map))
     if hash.has_key?(full_path.to_sym) 
-      puts "repo: I'm removing '#{basename}' from '#{repo_map}'"
+      STDOUT.puts "repo: I'm removing '#{basename}' from '#{repo_map}'"
     else
       STDERR.puts "repo: I don't have this repository -- '#{full_path}'"
       exit 1

data/lib/repomap/version.rb

@@ -1,3 +1,3 @@
 module RepoMap
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/repoman_spec.rb

@@ -6,7 +6,9 @@ require 'fileutils'
 include FileUtils
 
 module RepoMap
-  ENV['REPO_MAP'] = "#{File.dirname(__FILE__)}/../tmp/repomap.yml"
+  TEST_REPO_MAP = "#{File.dirname(__FILE__)}/../tmp/repomap.yml"
+  def repo_map; TEST_REPO_MAP; end
+  MANY_REPOS = "#{File.dirname(__FILE__)}/../tmp/many_repos"
   REPO1 = "#{File.dirname(__FILE__)}/../tmp/repo1"
 end
 
@@ -16,12 +18,16 @@ describe "RepoMap SubCommands" do
 
   before :each do
     mkdir_p "#{REPO1}/.git"
-    # so it's not empty...
     touch "#{REPO1}/README"
+    mkdir_p "#{MANY_REPOS}/repo2a/.git"
+    touch "#{MANY_REPOS}/repo2a/README"
+    mkdir_p "#{MANY_REPOS}/repo2b/.git"
+    touch "#{MANY_REPOS}/repo2b/README"
   end
 
   after :each do
     rm_rf "#{REPO1}/.git"
+    rm_rf "#{MANY_REPOS}"
   end
 
   after :all do
@@ -30,8 +36,8 @@ describe "RepoMap SubCommands" do
 
   describe "#add!" do
 
-    it "should add a given path to ENV['REPO_MAP']" do
-      opts = repo_opts :add, REPO1
+    it "should add a given path to RepoMap file" do
+      opts = repo_opts(:add, REPO1)
       RepoMap.handle(opts) 
       hash = YAML::load(File.read(repo_map))
       hash[File.expand_path(REPO1).to_sym][:name].should == File.basename(REPO1)
@@ -39,29 +45,43 @@ describe "RepoMap SubCommands" do
 
   end
 
+  describe "#add_recursive!" do
+    
+    it "should recursively add all git repo's in a certain path" do
+      opts = repo_opts(:add, MANY_REPOS, true)
+      RepoMap.handle(opts)
+      hash = YAML::load(File.read(repo_map))
+      repo2a_path = File.expand_path("#{MANY_REPOS}/repo2a")
+      repo2b_path = File.expand_path("#{MANY_REPOS}/repo2b")
+      hash[repo2a_path.to_sym][:name].should == File.basename(repo2a_path)
+      hash[repo2b_path.to_sym][:name].should == File.basename(repo2b_path)
+    end
+
+  end
+
   describe "#remove!" do
   
-    it "should remove a given path from ENV['REPO_MAP']" do
-      opts = repo_opts :add, REPO1
+    it "should remove a given path from RepoMap file" do
+      opts = repo_opts(:add, REPO1)
       RepoMap.handle opts
       hash1 = YAML::load(File.read(repo_map))
       repo1_in_repomap = hash1[File.expand_path(REPO1).to_sym][:name] \
                           == File.basename(REPO1)
-      opts = repo_opts :remove, REPO1
+      opts = repo_opts(:remove, REPO1)
       RepoMap.handle opts
       hash2 = YAML::load(File.read(repo_map))
       repo1_removed = !(hash2.has_key?(File.expand_path(REPO1).to_sym))
-      (repo1_in_repomap and repo1_removed).should == true
+      (repo1_in_repomap && repo1_removed).should == true
     end
   
   end
 
 end
 
-def repo_opts action, repo_path
+def repo_opts(action, repo_path, recursive=false)
   opts = {}
   opts[:action]  = action
   opts[:options] = {:path      => repo_path,
-                    :recursive => false}
+                    :recursive => recursive}
   return opts
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repomap
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,12 +79,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1475655317722997625
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1475655317722997625
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24