gemsync 0.1.4 → 0.1.5

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "gemsync"
-    gem.version = "0.1.4"
+    gem.version = "0.1.5"
     gem.summary = %Q{Small gem to sync multiple gem installations.}
     gem.description = %Q{Small gem to sync multiple gem installations. This can be done by pointing to a ruby installation or from a text file created by `gem list > file.txt`.}
     gem.email = "quest@mac.com"

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/gemsync

@@ -8,7 +8,7 @@ require 'trollop'
 # Setup arguments from the command line.
 # This uses the trollop library on github.
 opts = Trollop::options do
-  version "gemsync 0.1.4 (c) 2010 Josh Ellithorpe"
+  version "gemsync 0.1.5 (c) 2010 Josh Ellithorpe"
   banner <<-EOS
 Small gem to sync multiple gem installations.
 
@@ -17,7 +17,7 @@ Usage: gemsync [options]
 Available Options:
 EOS
   opt :source, "Either the ruby installation directory, or a list of gems produced from 'gem list'. Ex: /usr or /path/to/gemlist.txt", :type => String, :required => true
-  opt :destination, "Ruby installation directory you want to sync up. Ex: /opt/ruby-enterprise", :type => String, :required => true
+  opt :destination, "Ruby installation directory you want to sync up. Ex: /opt/ruby-enterprise", :type => String, :required => false
   opt :disable_sudo, "Disable sudo when installing gems", :default => false
   opt :build_docs, "Build documentation", :default => false
 end
@@ -33,14 +33,20 @@ else
   Trollop::die :source, "\n\t-- Binary '#{opts[:source]}/bin/gem' does not exist" unless File.exists?("#{opts[:source]}/bin/gem")
 end
 
-# Die if destination is set incorrectly
-Trollop::die :destination, "\n\t-- Directory '#{opts[:destination]}' does not exist" unless File.directory?(opts[:destination])
-Trollop::die :destination, "\n\t-- Binary '#{opts[:destination]}/bin/gem' does not exist" unless File.exists?("#{opts[:destination]}/bin/gem")
+# Attempt to set default destination based upon location of 'gem' binary
+if opts[:destination].nil?
+  guessed_destination_path = `which gem`.split('/')[0..-3].join('/')
+  Trollop::die :destination, "\n\t-- Destination was not set, and gemsync could not guess it" if (guessed_destination_path == opts[:source] || !File.directory?(guessed_destination_path))
+else
+  # Die if destination is set incorrectly
+  Trollop::die :destination, "\n\t-- Directory '#{opts[:destination]}' does not exist" unless File.directory?(opts[:destination])
+  Trollop::die :destination, "\n\t-- Binary '#{opts[:destination]}/bin/gem' does not exist" unless File.exists?("#{opts[:destination]}/bin/gem")
+end
 
 # Cleanup main and sync dir, they shouldn't end in a '/' so lets chomp it.
 # Couldn't use chomp! since opts are frozen.
 @main_dir = opts[:source].chomp('/')
-@sync_dir = opts[:destination].chomp('/')
+@sync_dir = opts[:destination].nil? ? guessed_destination_path.chomp('/') : opts[:destination].chomp('/')
 
 # Setup additional flags
 @docstring = opts[:build_docs] ? '' : '--no-ri --no-rdoc'
@@ -128,10 +134,10 @@ for gem in gems
       # Also look for mysql5 type binaries that some package managers use
       mysql_config = `which mysql_config` || `which mysql_config5`
       mysql_dir = `which mysql` || `which mysql5`
-      mysql_dir = mysql_dir.split('/')[0..-2].join('/')
+      mysql_dir = mysql_dir.split('/')[0..-3].join('/')
       system("#{@sudostring}#{@sync_dir}/bin/gem install #{gem_name} -v #{version} -- --with-mysql-dir=#{mysql_dir} --with-mysql-config=#{mysql_config} #{@docstring}")
     else
       system("#{@sudostring}#{@sync_dir}/bin/gem install #{gem_name} -v #{version} #{@docstring}")
     end
   end
-end
+end

data/gemsync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gemsync}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["quest"]
-  s.date = %q{2010-09-20}
+  s.date = %q{2010-09-21}
   s.default_executable = %q{gemsync}
   s.description = %q{Small gem to sync multiple gem installations. This can be done by pointing to a ruby installation or from a text file created by `gem list > file.txt`.}
   s.email = %q{quest@mac.com}
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/gemsync",
      "gemsync.gemspec",
-     "pkg/gemsync-0.1.4.gem",
+     "pkg/gemsync-0.1.5.gem",
      "rdoc/created.rid",
      "rdoc/files/README_rdoc.html",
      "rdoc/fr_class_index.html",

data/rdoc/created.rid

@@ -1 +1 @@
-Sun, 19 Sep 2010 04:00:03 -0700
+Tue, 21 Sep 2010 09:39:20 -0700

data/rdoc/index.html

@@ -5,14 +5,12 @@
 
 <!--
 
-    gemsync 0.1.3
-
+    gemsync 0.1.5
 
   -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>gemsync 0.1.3
-</title>
+  <title>gemsync 0.1.5</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 </head>
 <frameset rows="20%, 80%">

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gemsync
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - quest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -07:00
+date: 2010-09-21 00:00:00 -07:00
 default_executable: gemsync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ files:
 - VERSION
 - bin/gemsync
 - gemsync.gemspec
-- pkg/gemsync-0.1.4.gem
+- pkg/gemsync-0.1.5.gem
 - rdoc/created.rid
 - rdoc/files/README_rdoc.html
 - rdoc/fr_class_index.html