live_ast 1.0.1 → 1.0.2

data/CHANGES.rdoc

@@ -1,6 +1,10 @@
 
 = live_ast Changes
 
+== Version 1.0.2
+
+* handle -unix, -dos, -mac special encoding suffixes
+
 == Version 1.0.1
 
 * add tests for "def self.f" and "def A.f" (plugins were missing this construct)

data/devel/levitate.rb

@@ -1,5 +1,7 @@
 
 class Levitate
+  include Rake::DSL if defined? Rake::DSL
+
   def initialize(gem_name)
     @gem_name = gem_name
 
@@ -7,7 +9,7 @@ class Levitate
 
     yield self
 
-    self.class.instance_methods(false).each do |name|
+    self.class.instance_methods(false).sort.each do |name|
       if name.to_s =~ %r!\Adefine_!
         send(name)
       end
@@ -259,7 +261,7 @@ class Levitate
 
   attribute :remote_levitate do
     url = ENV["LEVITATE"] ||
-      "https://github.com/quix/levitate/raw/master/levitate.rb"
+      "https://raw.github.com/quix/levitate/master/levitate.rb"
     IO.popen("curl -s #{url}") { |f| f.read }
   end
 
@@ -497,7 +499,7 @@ class Levitate
         puts "Already up-to-date."
       else
         File.open(__FILE__, "w") { |f| f.print(remote_levitate) }
-        git "commit", __FILE__, "-m", "update levitate"
+        git "commit", __FILE__, "-m", "update tools"
         puts "Updated levitate."
       end
     end

data/lib/live_ast/reader.rb

@@ -12,7 +12,15 @@ module LiveAST
       # magic comment overrides BOM
       encoding = contents[MAGIC_COMMENT, 1] || utf8 || "US-ASCII"
 
-      contents.force_encoding(encoding)
+      contents.force_encoding(strip_special(encoding))
+    end
+
+    def self.strip_special(encoding)
+      if encoding =~ /\Autf8-mac\Z/i
+        "UTF8-MAC"
+      else
+        encoding.sub(/-(unix|dos|mac)\Z/i, "")
+      end
     end
   end
 end

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/backtrace_test.rb

@@ -140,7 +140,6 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
 
       if will_succeed
         assert_equal orig_top, live_top
-        here = Regexp.quote __FILE__
         assert_match(/somewhere:1002/, live_top)
       else
         assert_not_equal orig_top, live_top

data/test/encoding_test.rb

@@ -5,6 +5,10 @@ class AllEncodingTest < RegularTest
     default US-ASCII
     usascii US-ASCII
     utf8 UTF-8
+    utf8unix UTF-8
+    utf8mac UTF-8
+    utf8mac_alt UTF8-MAC
+    utf8dos UTF-8
     utf8bom UTF-8
     utf8bom_only UTF-8
     usascii_with_utf8bom US-ASCII

data/test/encoding_test/utf8dos.rb

@@ -0,0 +1,6 @@
+# -*- coding: utf-8-dos -*-
+module EncodingTest
+  def utf8dos_string
+    "大きな箱とねこ。"
+  end
+end

data/test/encoding_test/utf8mac.rb

@@ -0,0 +1,6 @@
+# -*- coding: utf-8-mac -*-
+module EncodingTest
+  def utf8mac_string
+    "大きな箱とねこ。"
+  end
+end

data/test/encoding_test/utf8mac_alt.rb

@@ -0,0 +1,6 @@
+# -*- coding: utf8-mac -*-
+module EncodingTest
+  def utf8mac_alt_string
+    "大きな箱とねこ。"
+  end
+end

data/test/encoding_test/utf8unix.rb

@@ -0,0 +1,6 @@
+# -*- coding: utf-8-unix -*-
+module EncodingTest
+  def utf8unix_string
+    "大きな箱とねこ。"
+  end
+end

data/test/error_test.rb

@@ -3,6 +3,7 @@ require_relative 'main'
 class ErrorTest < RegularTest
   def test_multiple_lambda_same_line
     a = lambda { } ; b = lambda { }
+    ignore(b)
     
     assert_raises LiveAST::MultipleDefinitionsOnSameLineError do
       a.to_ast

data/test/main.rb

@@ -103,6 +103,9 @@ class BaseTest < JLMiniTest
       e.backtrace
     end
   end
+
+  def ignore(*args)
+  end
 end
 
 class RegularTest < BaseTest

data/test/replace_eval_test.rb

@@ -40,6 +40,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
 
   def moo
     a = 22
+    ignore(a)
     binding
   end
 
@@ -265,6 +266,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
 
   def test_module_eval_binding
     x = 33
+    ignore(x)
     orig = Class.new
     orig.live_ast_original_module_eval %{
       define_method :value do
@@ -278,6 +280,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
     assert orig.new.f.is_a?(Proc)
 
     y = 44
+    ignore(y)
     live = Class.new
     live.module_eval %{
       define_method :value do
@@ -339,6 +342,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
 
   def test_local_var_collision
     args = 33
+    ignore(args)
 
     assert_equal 33, live_ast_original_eval("args")
     assert_equal 33, eval("args")

data/test/rubygems_test.rb

@@ -4,8 +4,15 @@ require_relative '../devel/levitate'
 class RubygemsTest < RegularTest
   def test_rubygems
     lib = File.expand_path(File.dirname(__FILE__) + "/../lib")
+    extra_req =
+      if defined?(LiveASTRipper) and LiveAST.parser == LiveASTRipper
+        %{require 'live_ast_ripper'}
+      else
+        ""
+      end
     result = Levitate.run_code_and_capture %{
       $LOAD_PATH.unshift '#{lib}'
+      #{extra_req}
       require 'live_ast/full'
       LiveAST.parser::Test
       f = eval %{

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: live_ast
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-08-02 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: live_ast_ruby_parser
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id001
@@ -78,6 +87,10 @@ files:
 - test/encoding_test/utf8.rb
 - test/encoding_test/utf8bom.rb
 - test/encoding_test/utf8bom_only.rb
+- test/encoding_test/utf8dos.rb
+- test/encoding_test/utf8mac.rb
+- test/encoding_test/utf8mac_alt.rb
+- test/encoding_test/utf8unix.rb
 - test/error_test.rb
 - test/eval_test.rb
 - test/flush_cache_test.rb
@@ -101,6 +114,7 @@ files:
 - test/to_ast_feature_test.rb
 - test/to_ruby_feature_test.rb
 - test/to_ruby_test.rb
+has_rdoc: true
 homepage: http://quix.github.com/live_ast
 licenses: []
 
@@ -144,17 +158,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 9
+      - 2
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Live abstract syntax trees of methods and procs.