geminstaller 0.5.3 → 0.5.4

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.4 / 2009-11-15
+* Add -b / --bundler-export option to create bundler Gemfile - but make sure you only include direct dependencies, and let bundler handle the rest!
+
 == 0.5.3 / 2009-08-25
 * Many long overdue bugfixes and patches, see http://tinyurl.com/geminstaller-0-5-3-release for details.
 * Thanks to Greg Fitzgerald, Britt Crawford, John Trupiano, Gabriel Gironda, and Eric Hodel for patches and assistance.

data/Manifest.txt

@@ -16,6 +16,7 @@ lib/geminstaller/application.rb
 lib/geminstaller/arg_parser.rb
 lib/geminstaller/autogem.rb
 lib/geminstaller/backward_compatibility.rb
+lib/geminstaller/bundler_exporter.rb
 lib/geminstaller/config.rb
 lib/geminstaller/config_builder.rb
 lib/geminstaller/enhanced_stream_ui.rb

data/bin/geminstaller

@@ -3,7 +3,7 @@
 dir = File.dirname(__FILE__)
 
 begin
-  require 'geminstaller'
+  require ' geminstaller'
 rescue LoadError
   require 'rubygems'
   begin

data/lib/geminstaller.rb

@@ -34,7 +34,7 @@ module GemInstaller
   end
 
   def self.version
-    "0.5.3"
+    "0.5.4"
   end
 
   def self.create_application(args = [], registry = nil)

data/lib/geminstaller/application.rb

@@ -1,7 +1,7 @@
 module GemInstaller
   class Application
     # we have accessors instead of just writers so that we can ensure it is assembled correctly in the dependency injector test
-    attr_accessor :config_builder, :install_processor, :output_filter, :arg_parser, :args, :options, :rogue_gem_finder
+    attr_accessor :config_builder, :install_processor, :output_filter, :arg_parser, :args, :options, :rogue_gem_finder, :bundler_exporter
     attr_writer :autogem
     
     def initialize
@@ -14,6 +14,10 @@ module GemInstaller
         if exit_flag_and_return_code[0]
           return exit_flag_and_return_code[1]
         end
+        if @options[:bundler_export]
+          @bundler_exporter.output(@config_builder.build_config)
+          return 0
+        end
         gems = create_gems_from_config
         if @options[:print_rogue_gems]
           @rogue_gem_finder.print_rogue_gems(gems, @config_builder.config_file_paths_array)

data/lib/geminstaller/arg_parser.rb

@@ -47,6 +47,7 @@ module GemInstaller
         help_msg =                           "Show this message."
         print_rogue_gems_msg =               "Print a report of all locally installed gems which are not specified\n" +
         "                                     in the geminstaller config file."
+        bundler_export_msg =                 "Export a Bundler manifest Gemfile based on the geminstaller config"
         rubygems_output_msg =                "Comma-delimited list of output types to show from internal:\n" +
         "                                       RubyGems command invocation.\n" +
         "                                       Examples:\n" + 
@@ -88,6 +89,10 @@ module GemInstaller
           @options[:print_rogue_gems] = true
         end
 
+        opts.on("-b", "--bundler-export", bundler_export_msg) do
+          @options[:bundler_export] = true
+        end
+
         opts.on("-rTYPES", "--rubygems-output=TYPES", String, rubygems_output_msg) do |rubygems_output_flags|
           @unparsed_rubygems_output_flags = rubygems_output_flags
         end

data/lib/geminstaller/autogem.rb

@@ -39,7 +39,7 @@ module GemInstaller
         rescue Gem::Exception => e
           exception_message = e.message
           exception_message.strip!
-          error_message = "Error: GemInstaller failed to actiate gem '#{name}', version '#{version}'.  This is probably because GemInstaller processes gems in order (was alphabetical prior to 0.5.0), and an earlier gem in your geminstaller.yml config already activated another version.  Use the 'gem dependency [-R]' command to track this down, and reorder/edit your config as necessary.  Original Gem::Exception was: '#{exception_message}'"
+          error_message = "Error: GemInstaller failed to activate gem '#{name}', version '#{version}'.  This may be because GemInstaller processes gems in order (was alphabetical prior to 0.5.0), and an earlier gem in your geminstaller.yml config already activated another version.  Use the 'gem dependency [-R]' command to track this down, and reorder/edit your config as necessary.  Original Gem::Exception was: '#{exception_message}'"
           raise GemInstaller::GemInstallerError.new(error_message)
         end
       end

data/lib/geminstaller/backward_compatibility.rb

@@ -8,3 +8,10 @@ else
   LIST_COMMAND_CLASS = Gem::Commands::ListCommand
   QUERY_COMMAND_CLASS = Gem::Commands::QueryCommand
 end
+
+# >1.3.5 changed Gem::Version::Requirement to Gem::Requirement
+if GemInstaller::RubyGemsVersionChecker.matches?('>1.3.5')
+  GemInstaller::REQUIREMENT_CLASS = Gem::Requirement
+else
+  GemInstaller::REQUIREMENT_CLASS = Gem::Version::Requirement
+end

data/lib/geminstaller/bundler_exporter.rb

@@ -0,0 +1,19 @@
+module GemInstaller
+  class BundlerExporter
+    attr_writer :output_proxy
+    
+    def output(config)
+      output_string = convert(config)
+      @output_proxy.sysout output_string
+      output_string
+    end
+
+    def convert(config)
+      manifest = ""
+      config.gems.each do |gem|
+        manifest += %Q{gem "#{gem.name}", "#{gem.version}"\n}
+      end
+      manifest
+    end
+  end
+end

data/lib/geminstaller/registry.rb

@@ -4,7 +4,7 @@ module GemInstaller
     attr_accessor :gem_runner, :gem_command_manager, :gem_list_checker, :app, :arg_parser, :options
     attr_accessor :install_processor, :missing_dependency_finder, :valid_platform_selector
     attr_accessor :output_listener, :outs_output_observer, :errs_output_observer, :output_filter, :autogem, :rogue_gem_finder
-    attr_accessor :gem_spec_manager, :source_index_search_adapter
+    attr_accessor :gem_spec_manager, :source_index_search_adapter, :bundler_exporter
     
     if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.4')
       attr_accessor :gem_interaction_handler, :noninteractive_chooser
@@ -37,6 +37,9 @@ module GemInstaller
       @config_builder.file_reader = @file_reader
       @config_builder.yaml_loader = @yaml_loader
       @config_builder.output_filter = @output_filter
+      
+      @bundler_exporter = GemInstaller::BundlerExporter.new
+      @bundler_exporter.output_proxy = @output_proxy
 
       @gem_source_index = Gem::SourceIndex.from_installed_gems
       @gem_source_index_proxy = GemInstaller::GemSourceIndexProxy.new
@@ -117,6 +120,7 @@ module GemInstaller
       @app = GemInstaller::Application.new
       @app.autogem = @autogem
       @app.rogue_gem_finder = @rogue_gem_finder
+      @app.bundler_exporter = @bundler_exporter
       @app.options = @options
       @app.arg_parser = @arg_parser
       @app.config_builder = @config_builder

data/lib/geminstaller/requires.rb

@@ -46,6 +46,7 @@ require File.expand_path("#{dir}/../geminstaller")
 require File.expand_path("#{dir}/application")
 require File.expand_path("#{dir}/arg_parser")
 require File.expand_path("#{dir}/autogem")
+require File.expand_path("#{dir}/bundler_exporter")
 require File.expand_path("#{dir}/config")
 require File.expand_path("#{dir}/config_builder")
 require File.expand_path("#{dir}/registry")

data/lib/geminstaller/rogue_gem_finder.rb

@@ -16,7 +16,7 @@ module GemInstaller
         config_match_found_for_local = false
         @config_gems_with_dependencies.each do |config_gem|
           name_matches = config_gem.name == local_gem.name
-          config_gem_version_requirement = Gem::Version::Requirement.new [config_gem.version]
+          config_gem_version_requirement = GemInstaller::REQUIREMENT_CLASS.new [config_gem.version]
           local_gem_version = Gem::Version.new(local_gem.version)
           version_matches = config_gem_version_requirement.satisfied_by?(local_gem_version)
           if (name_matches and version_matches)

data/lib/geminstaller/rubygems_version_checker.rb

@@ -7,7 +7,15 @@ module GemInstaller
       # system-rubygems version instead of the geminstaller-overridden version.  Need to figure out how
       # to re-parse 'rubygems/rubygems_version' and let it redefine 'Gem::RubyGemsVersion'
       rubygems_version = options[:rubygems_version] ||= Gem::RubyGemsVersion
-      Gem::Version::Requirement.new(version_spec).satisfied_by?(Gem::Version.new(rubygems_version))
+      
+      # Manually check here in addition to backward_compatibility.rb, to avoid circular dependency
+      if defined?(Gem::Requirement)
+        requirement_class = Gem::Requirement
+      else
+        requirement_class = Gem::Version::Requirement
+      end
+      
+      requirement_class.new(version_spec).satisfied_by?(Gem::Version.new(rubygems_version))
     end
   end
 end

data/lib/geminstaller/version_specifier.rb

@@ -3,7 +3,7 @@ module GemInstaller
     # NOTE: available_versions should be sorted in descending order (highest versions first)
     # This method will return the first matching version
     def specify(version_requirement, available_versions, gem_name = nil)
-      rubygems_version_requirement = Gem::Version::Requirement.new [version_requirement]
+      rubygems_version_requirement = GemInstaller::REQUIREMENT_CLASS.new [version_requirement]
       if available_versions.respond_to? :to_str
         available_versions = available_versions.split(', ')
       end

data/website/src/index.page

@@ -46,6 +46,8 @@ Please "report any others that you find":http://thewoolleyweb.lighthouseapp.com/
 
 h2(#history). History
 
+* 0.5.4
+** Add -b / --bundler-export option to create bundler Gemfile - but make sure you only include direct dependencies, and let bundler handle the rest!
 * 0.5.3
 ** Many long overdue bugfixes and patches, see http://tinyurl.com/geminstaller-0-5-3-release for details.
 ** Thanks to Greg Fitzgerald, Britt Crawford, John Trupiano, Gabriel Gironda, and Eric Hodel for patches and assistance.

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: geminstaller
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Chad Woolley
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-11-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +49,7 @@ files:
 - lib/geminstaller/arg_parser.rb
 - lib/geminstaller/autogem.rb
 - lib/geminstaller/backward_compatibility.rb
+- lib/geminstaller/bundler_exporter.rb
 - lib/geminstaller/config.rb
 - lib/geminstaller/config_builder.rb
 - lib/geminstaller/enhanced_stream_ui.rb
@@ -116,14 +122,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: geminstaller