rubygems-compile 1.0.1 → 1.0.2

data/lib/rubygems-compile/analyzer.rb

@@ -16,7 +16,7 @@ class Gem::Analyzer < Ripper::SexpBuilder
   def on_kw token
     # Related to MacRuby ticket #721
     if token == '__FILE__'
-      raise Warning, 'The __FILE__ keyword is used in this file'
+      raise Warning, '__FILE__ keyword is used (MacRuby ticket #721)'
     end
   end
 

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

@@ -1,4 +1,7 @@
 require 'rubygems/dependency_list'
+require 'rubygems/version_option'
+require 'rubygems-compile/common_methods'
+
 
 ##
 # Use the MacRuby compiler to compile installed gems.
@@ -44,6 +47,7 @@ class Gem::Commands::CompileCommand < Gem::Command
       alert 'This could take a while; you might want to take a coffee break'
     end
 
+    require 'rubygems-compile/compiler'
     compiler = Gem::Compiler.new
     gems.each { |gem| compiler.compile(gem) }
   end

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

@@ -1,3 +1,6 @@
+require 'rubygems/version_option'
+require 'rubygems-compile/common_methods'
+
 class Gem::Commands::UncompileCommand < Gem::Command
   include Gem::VersionOption
   include Gem::CompileMethods
@@ -32,6 +35,7 @@ class Gem::Commands::UncompileCommand < Gem::Command
   # an uncompiler object for each of them.
 
   def execute
+    require 'rubygems-compile/uncompiler'
     uncompiler = Gem::Uncompiler.new
     execution_list.each { |gem| uncompiler.uncompile(gem) }
   end

data/lib/rubygems-compile/compiler.rb

@@ -2,6 +2,12 @@ class Gem::Compiler
   include Gem::UserInteraction
 
   def initialize
+    require 'rbconfig'
+    unless MacRuby.const_defined?(:Compiler)
+      load File.join(RbConfig::CONFIG['bindir'], 'macrubyc')
+    end
+    require 'rubygems-compile/analyzer'
+
     @current_directory = []
     @config            = Gem.configuration
   end
@@ -10,21 +16,25 @@ class Gem::Compiler
     @spec = gem.is_a?(Gem::Specification) ? gem : gem.spec
 
     if @spec.name == 'rubygems-compile'
-      alert_info 'You cannot compile rubygems-compile' if @config.really_verbose
+      alert_info 'You cannot compile rubygems-compile' if really_verbose
       return
     end
 
-    say compilation_message if @config.verbose
+    say compilation_message if verbose
 
     gem_files.each do |file|
-      say compile_file_msg(file) if @config.really_verbose
+      message            = compile_file_msg(file)
       absolute_file_path = File.join(@spec.full_gem_path, file)
-      next if unsafe?(absolute_file_path)
-      MacRuby::Compiler.new(
-                            bundle: true,
-                            output: "#{absolute_file_path}o",
-                             files: [absolute_file_path]
-                            ).run
+      if warning = unsafe?(absolute_file_path)
+        message << "\t\t\tSKIPPED: #{warning.message}"
+      else
+        MacRuby::Compiler.new(
+                              bundle: true,
+                              output: "#{absolute_file_path}o",
+                               files: [absolute_file_path]
+                              ).run
+      end
+      say message if really_verbose
     end
   end
   alias_method :compile, :call
@@ -37,13 +47,11 @@ class Gem::Compiler
     Gem::Analyzer.new(File.read(file)).parse
     false
   rescue Gem::Analyzer::Warning => e
-    say "WARNING: #{e.message}"
-    say 'Compilation of this file will be skipped'
-    true
+    e
   end
 
   def compilation_message
-    slash = @config.really_verbose ? '/' : ''
+    slash = really_verbose ? '/' : ''
     "Compiling #{@spec.full_name}#{slash}"
   end
 
@@ -74,11 +82,19 @@ class Gem::Compiler
     dirs.each_with_index do |dir, index|
       unless @current_directory[index] == dir
         @current_directory[index] = dir
-        say( "\t" * (index + 1) + dir + File::SEPARATOR)
+        say( "\t" * (index + 1) + dir + File::SEPARATOR) if really_verbose
       end
     end
 
     "#{tabs}#{name} => #{name}o"
   end
 
+  def verbose
+    @config.verbose
+  end
+
+  def really_verbose
+    @config.really_verbose
+  end
+
 end

data/lib/rubygems-compile/post_install_hook.rb

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

data/lib/rubygems_plugin.rb

@@ -6,19 +6,13 @@ unless MACRUBY_REVISION.match /^git commit/
 
 else
 
-  require 'rbconfig'
-  require 'fileutils'
-  require 'rubygems/version_option'
-
-  unless MacRuby.const_defined?(:Compiler)
-    load File.join(RbConfig::CONFIG['bindir'], 'macrubyc')
-  end
-
-  require 'rubygems-compile/common_methods'
-  require 'rubygems-compile/analyzer'
-  require 'rubygems-compile/compiler'
-  require 'rubygems-compile/uncompiler'
-  require 'rubygems-compile/commands'
   require 'rubygems-compile/post_install_hook'
+  require 'rubygems-compile/commands/compile_command'
+  require 'rubygems-compile/commands/uncompile_command'
+  require 'rubygems-compile/commands/autocompile_command'
+
+  Gem::CommandManager.instance.register_command :compile
+  Gem::CommandManager.instance.register_command :uncompile
+  Gem::CommandManager.instance.register_command :auto_compile
 
 end

metadata

@@ -1,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-compile
 version: !ruby/object:Gem::Version
-  version: 1.0.1
   prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Mark Rada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00 -05:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70340768600960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: "2.11"
   type: :development
-  prerelease: false
-  version_requirements: *70340768600960
-description: ! 'A trio of rubygems commands that interface with the MacRuby compiler.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: "2.11"
+description: 'A trio of rubygems commands that interface with the MacRuby compiler.
 
 '
 email: mrada@marketcircle.com
@@ -36,7 +42,6 @@ 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/commands.rb
 - lib/rubygems-compile/common_methods.rb
 - lib/rubygems-compile/compiler.rb
 - lib/rubygems-compile/post_install_hook.rb
@@ -52,10 +57,11 @@ files:
 - .gemtest
 - LICENSE.txt
 - README.markdown
+has_rdoc: true
 homepage: http://github.com/ferrous26/rubygems-compile
 licenses:
 - MIT
-post_install_message: ! "\n***********************************************************\n\nPlease
+post_install_message: "\n***********************************************************\n\nPlease
   uninstall previous versions of this gem, or else\nrubygems will try to load each
   version of the gem.\n\nThis version of rubygems-compile requires MacRuby 0.11 or\nnewer;
   the functionality has changed significantly since\npre-1.0 releases, see the README:\n\n
@@ -66,18 +72,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: "0"
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A trio of rubygems commands that interface with the MacRuby compiler

data/lib/rubygems-compile/commands.rb

@@ -1,8 +0,0 @@
-require 'rubygems-compile/commands/compile_command'
-Gem::CommandManager.instance.register_command :compile
-
-require 'rubygems-compile/commands/uncompile_command'
-Gem::CommandManager.instance.register_command :uncompile
-
-require 'rubygems-compile/commands/autocompile_command'
-Gem::CommandManager.instance.register_command :auto_compile