rubygems-compile 1.0.2 → 1.1.0

data/README.markdown

@@ -6,7 +6,7 @@ MacRuby compiler. This gem requires MacRuby 0.11 or newer.
 All you need to do is:
 
 ```bash
-sudo macgem install rubygems-compile --pre
+sudo macgem install rubygems-compile
 ```
 
 And then you're off to the races!
@@ -73,11 +73,10 @@ sudo macgem auto_compile  # gems will not be compiled when you install them
 
 ## TODO
 
-* Code parsing to WARN about gems that will have issues when compiled
 * Parallel compilation to speed up compilation of large gems
   + This might require changes in the MacRuby compiler
 
 ## Copyright
 
-Copyright (c) 2011 Mark Rada. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 Mark Rada. See LICENSE.txt for further details.
 

data/lib/rubygems-compile/analyzer.rb

@@ -7,16 +7,29 @@ require 'ripper'
 class Gem::Analyzer < Ripper::SexpBuilder
 
   ##
-  # Raised in any case that the given code might display bad
-  # behaviours that were not intended.
+  # Cache of issues found for the current session.
 
-  class Warning < Exception
+  attr_reader :warnings
+
+  ##
+  # Check the given string of code for potential issues when compiled.
+  # Returns the analyzer instance afterwards.
+
+  def self.check code
+    @parser ||= Gem::Analyzer.new(code)
+    @parser.parse
+    @parser
+  end
+
+  def parse
+    @warnings = []
+    super
   end
 
   def on_kw token
     # Related to MacRuby ticket #721
     if token == '__FILE__'
-      raise Warning, '__FILE__ keyword is used (MacRuby ticket #721)'
+      @warnings << '__FILE__ keyword is used (MacRuby ticket #721)'
     end
   end
 

data/lib/rubygems-compile/commands/compile_command.rb

@@ -1,6 +1,6 @@
 require 'rubygems/dependency_list'
 require 'rubygems/version_option'
-require 'rubygems-compile/common_methods'
+require 'rubygems-compile/compile_methods'
 
 
 ##
@@ -41,15 +41,12 @@ class Gem::Commands::CompileCommand < Gem::Command
 
   def execute
     gems = execution_list
-    gems.delete_if { |spec| spec.name == 'rubygems-compile' }
-
     if gems.count >= 10
-      alert 'This could take a while; you might want to take a coffee break'
+      alert 'This could take a while...'
     end
 
     require 'rubygems-compile/compiler'
-    compiler = Gem::Compiler.new
-    gems.each { |gem| compiler.compile(gem) }
+    gems.each { |gem| Gem::Compiler.compile gem }
   end
 
 end

data/lib/rubygems-compile/commands/uncompile_command.rb

@@ -1,5 +1,5 @@
 require 'rubygems/version_option'
-require 'rubygems-compile/common_methods'
+require 'rubygems-compile/compile_methods'
 
 class Gem::Commands::UncompileCommand < Gem::Command
   include Gem::VersionOption
@@ -36,8 +36,7 @@ class Gem::Commands::UncompileCommand < Gem::Command
 
   def execute
     require 'rubygems-compile/uncompiler'
-    uncompiler = Gem::Uncompiler.new
-    execution_list.each { |gem| uncompiler.uncompile(gem) }
+    execution_list.each { |gem| Gem::Uncompiler.uncompile(gem) }
   end
 
 end

data/lib/rubygems-compile/compile_methods.rb

@@ -0,0 +1,74 @@
+module Gem::CompileMethods
+if Gem::VERSION.to_f < 1.8
+
+  def execution_list
+    return all_gemspecs if options[:all]
+
+    specs = get_all_gem_names.map do |gem|
+      candidates = Gem.source_index.find_name(gem, options[:version])
+
+      if candidates.empty?
+        alert_error "#{gem} is not installed. Skipping."
+        next
+      end
+
+      candidates << dependencies_for(candidates) unless options[:ignore]
+      candidates
+    end
+    specs.flatten!
+    specs.uniq!
+    specs.delete_if { |spec| spec.name == 'rubygems-compile' }
+    specs
+  end
+
+
+  private
+
+  def all_gemspecs
+    specs = Gem.source_index.all_gems.map(&:last)
+    specs.select { |spec| spec.name != 'rubygems-compile' }
+  end
+
+  def dependencies_for specs
+    specs.map { |spec|
+      spec.runtime_dependencies.map { |dep|
+        deps = Gem.source_index.find_name(dep.name, dep.requirement)
+        deps + dependencies_for(deps)
+      }
+    }
+  end
+
+else
+
+  def execution_list
+    return all_gemspecs if options[:all]
+
+    specs = get_all_gem_names.map { |gem|
+      gems = Gem::Specification.find_all_by_name(gem, options[:version])
+      gems << dependencies_for(gems) unless options[:ignore]
+      gems
+    }
+    specs.flatten!
+    specs.uniq!
+    specs.delete_if { |spec| spec.name == 'rubygems_compile' }
+    specs
+  end
+
+
+  private
+
+  def all_gemspecs
+    Gem::Specification.select { |spec| spec.name != 'rubygems-compile' }
+  end
+
+  def dependencies_for specs
+    specs.map { |spec|
+      spec.runtime_dependencies.map { |dep|
+        deps = Gem::Specification.find_all_by_name(dep.name, dep.requirement)
+        deps + dependencies_for(deps)
+      }
+    }
+  end
+
+end
+end

data/lib/rubygems-compile/compiler.rb

@@ -1,6 +1,14 @@
 class Gem::Compiler
   include Gem::UserInteraction
 
+  class << self
+    def compile gem
+      @instance ||= Gem::Compiler.new
+      @instance.compile gem
+    end
+    alias_method :call, :compile
+  end
+
   def initialize
     require 'rbconfig'
     unless MacRuby.const_defined?(:Compiler)
@@ -12,45 +20,34 @@ class Gem::Compiler
     @config            = Gem.configuration
   end
 
-  def call gem
+  def compile gem
     @spec = gem.is_a?(Gem::Specification) ? gem : gem.spec
 
-    if @spec.name == 'rubygems-compile'
-      alert_info 'You cannot compile rubygems-compile' if really_verbose
-      return
-    end
-
-    say compilation_message if verbose
+    return if trying_to_compile_self?
+    say gem_compilation_message if verbose
 
     gem_files.each do |file|
-      message            = compile_file_msg(file)
-      absolute_file_path = File.join(@spec.full_gem_path, file)
-      if warning = unsafe?(absolute_file_path)
-        message << "\t\t\tSKIPPED: #{warning.message}"
+      message   = compile_file_message(file)
+      full_path = File.join(@spec.full_gem_path, file)
+      if unsafe? full_path
+        message << "\t\t\tSKIPPED: #{@parser.warnings.join(', ')}"
       else
-        MacRuby::Compiler.new(
-                              bundle: true,
-                              output: "#{absolute_file_path}o",
-                               files: [absolute_file_path]
-                              ).run
+        MacRuby::Compiler.compile_file full_path
       end
       say message if really_verbose
     end
   end
-  alias_method :compile, :call
 
   ##
   # Uses the GemAnalyzer class to determine if a given file might have
   # any potential issues when compiled.
 
   def unsafe? file
-    Gem::Analyzer.new(File.read(file)).parse
-    false
-  rescue Gem::Analyzer::Warning => e
-    e
+    @parser = Gem::Analyzer.check File.read(file)
+    !@parser.warnings.empty?
   end
 
-  def compilation_message
+  def gem_compilation_message
     slash = really_verbose ? '/' : ''
     "Compiling #{@spec.full_name}#{slash}"
   end
@@ -67,14 +64,19 @@ class Gem::Compiler
   # level or test directory.
   #
 
-  def gem_files
-    @spec.lib_files.select { |file| File.extname(file) == '.rb' }
-    # files = @spec.files - @spec.test_files - @spec.extra_rdoc_files
-    # files.reject { |file| file.match /^(?:test|spec)/ }
-    #   .select { |file| file.match /\.rb$/ }
+  if Gem::VERSION.to_f < 1.8
+    def gem_files
+      @spec.lib_files.select { |file| File.extname(file) == '.rb' }
+    end
+  else
+    def gem_files
+      Dir.glob("#{@spec.lib_dirs_glob}/**/*.rb").map { |file|
+        file.sub(Regexp.new(Regexp.escape(@spec.full_gem_path)), '')
+      }
+    end
   end
 
-  def compile_file_msg file
+  def compile_file_message file
     name = File.basename(file)
     dirs = file.chomp(name).split(File::SEPARATOR)
     tabs = "\t" * dirs.count
@@ -97,4 +99,11 @@ class Gem::Compiler
     @config.really_verbose
   end
 
+  def trying_to_compile_self?
+    if @spec.name == 'rubygems-compile'
+      alert 'You cannot compile rubygems-compile' if really_verbose
+      true
+    end
+  end
+
 end

data/lib/rubygems-compile/post_install_hook.rb

@@ -5,6 +5,6 @@
 if Gem.configuration[:compile]
   require 'rubygems-compile/compiler'
   module Gem
-    @post_install_hooks << ::Gem::Compiler.new
+    @post_install_hooks << ::Gem::Compiler
   end
 end

data/lib/rubygems-compile/uncompiler.rb

@@ -1,7 +1,13 @@
 class Gem::Uncompiler
   include Gem::UserInteraction
 
+  def self.uncompile gem
+    @instance ||= Gem::Uncompiler.new
+    @instance.uncompile gem
+  end
+
   def initialize
+    require 'fileutils'
     @config = Gem.configuration
   end
 
@@ -11,9 +17,9 @@ class Gem::Uncompiler
     say uncompilation_message if @config.verbose
 
     gem_files.each do |file|
-      say "\tAsploded #{file}" if @config.really_verbose
       absolute_file_path = File.join(@spec.full_gem_path, file)
       FileUtils.rm absolute_file_path
+      say "\tAsploded #{file}" if @config.really_verbose
     end
   end
 

metadata

@@ -2,15 +2,14 @@
 name: rubygems-compile
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Rada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00 -05:00
-default_executable: 
+date: 2012-02-12 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -42,7 +41,7 @@ files:
 - lib/rubygems-compile/commands/autocompile_command.rb
 - lib/rubygems-compile/commands/compile_command.rb
 - lib/rubygems-compile/commands/uncompile_command.rb
-- lib/rubygems-compile/common_methods.rb
+- lib/rubygems-compile/compile_methods.rb
 - lib/rubygems-compile/compiler.rb
 - lib/rubygems-compile/post_install_hook.rb
 - lib/rubygems-compile/uncompiler.rb
@@ -57,7 +56,6 @@ files:
 - .gemtest
 - LICENSE.txt
 - README.markdown
-has_rdoc: true
 homepage: http://github.com/ferrous26/rubygems-compile
 licenses:
 - MIT
@@ -83,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A trio of rubygems commands that interface with the MacRuby compiler

data/lib/rubygems-compile/common_methods.rb

@@ -1,40 +0,0 @@
-module Gem
-
-  module CompileMethods
-
-    def execution_list
-      gems_list.map do |gem|
-        candidates = Gem.source_index.find_name(gem, options[:version])
-
-        if candidates.empty?
-          alert_error "#{gem} is not installed. Skipping."
-          next
-        end
-
-        candidates << dependencies_for(*candidates) unless options[:ignore]
-        candidates
-      end.flatten.uniq
-    end
-
-    def gems_list
-      # @todo Gem.source_index is going away...
-      installed_gems = Gem.source_index.all_gems
-      if options[:all] then
-        installed_gems.map { |_, spec| spec.name }
-      else
-        get_all_gem_names
-      end
-    end
-
-    def dependencies_for *specs
-      specs.map { |spec|
-        spec.runtime_dependencies.map { |dep|
-          deps = Gem.source_index.find_name(dep.name,dep.requirement)
-          deps + dependencies_for(*deps)
-        }
-      }
-    end
-
-  end
-
-end