unparser 0.1.5 → 0.1.6

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.1.5'
+  s.version  = '0.1.6'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'
@@ -15,11 +15,12 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_paths    = %w(lib)
   s.extra_rdoc_files = %w(README.md)
-  s.executables      = [ 'test-unparser' ]
+  s.executables      = [ 'unparser' ]
 
-  s.add_dependency('parser',        '~> 2.0.0')
+  s.add_dependency('parser',        '~> 2.1.0')
+  s.add_dependency('procto',        '~> 0.0.2')
   s.add_dependency('concord',       '~> 0.1.4')
-  s.add_dependency('adamantium',    '~> 0.1.0')
+  s.add_dependency('adamantium',    '~> 0.1')
   s.add_dependency('equalizer',     '~> 0.0.7')
   s.add_dependency('abstract_type', '~> 0.0.7')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: procto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +97,7 @@ dependencies:
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
 executables:
-- test-unparser
+- unparser
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -99,7 +113,7 @@ files:
 - README.md
 - Rakefile
 - TODO
-- bin/test-unparser
+- bin/unparser
 - circle.yml
 - config/devtools.yml
 - config/flay.yml
@@ -110,6 +124,10 @@ files:
 - config/yardstick.yml
 - lib/unparser.rb
 - lib/unparser/buffer.rb
+- lib/unparser/cli.rb
+- lib/unparser/cli/differ.rb
+- lib/unparser/cli/preprocessor.rb
+- lib/unparser/cli/source.rb
 - lib/unparser/comments.rb
 - lib/unparser/constants.rb
 - lib/unparser/emitter.rb
@@ -132,10 +150,11 @@ files:
 - lib/unparser/emitter/hookexe.rb
 - lib/unparser/emitter/if.rb
 - lib/unparser/emitter/literal.rb
-- lib/unparser/emitter/literal/composed.rb
+- lib/unparser/emitter/literal/array.rb
 - lib/unparser/emitter/literal/dynamic.rb
 - lib/unparser/emitter/literal/dynamic_body.rb
 - lib/unparser/emitter/literal/execute_string.rb
+- lib/unparser/emitter/literal/hash.rb
 - lib/unparser/emitter/literal/primitive.rb
 - lib/unparser/emitter/literal/range.rb
 - lib/unparser/emitter/literal/regexp.rb
@@ -152,6 +171,8 @@ files:
 - lib/unparser/emitter/return.rb
 - lib/unparser/emitter/root.rb
 - lib/unparser/emitter/send.rb
+- lib/unparser/emitter/send/arguments.rb
+- lib/unparser/emitter/send/attribute_assignment.rb
 - lib/unparser/emitter/send/binary.rb
 - lib/unparser/emitter/send/index.rb
 - lib/unparser/emitter/send/regular.rb
@@ -162,6 +183,7 @@ files:
 - lib/unparser/emitter/variable.rb
 - lib/unparser/emitter/yield.rb
 - lib/unparser/finalize.rb
+- lib/unparser/node_helpers.rb
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb
 - spec/unit/unparser/buffer/append_without_prefix_spec.rb
@@ -172,7 +194,6 @@ files:
 - spec/unit/unparser/buffer/nl_spec.rb
 - spec/unit/unparser/buffer/unindent_spec.rb
 - spec/unit/unparser/comments/consume_spec.rb
-- spec/unit/unparser/comments/skip_eol_comment_spec.rb
 - spec/unit/unparser/comments/take_all_spec.rb
 - spec/unit/unparser/comments/take_before_spec.rb
 - spec/unit/unparser/comments/take_eol_comments_spec.rb
@@ -199,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
@@ -214,7 +235,6 @@ test_files:
 - spec/unit/unparser/buffer/nl_spec.rb
 - spec/unit/unparser/buffer/unindent_spec.rb
 - spec/unit/unparser/comments/consume_spec.rb
-- spec/unit/unparser/comments/skip_eol_comment_spec.rb
 - spec/unit/unparser/comments/take_all_spec.rb
 - spec/unit/unparser/comments/take_before_spec.rb
 - spec/unit/unparser/comments/take_eol_comments_spec.rb

data/bin/test-unparser

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-trap('INT') do |status|
-  exit! 128 + status
-end
-
-require 'unparser'
-require 'parser/current'
-
-ARGV.each do |file|
-  source    = File.read(file)
-  node      = Parser::CurrentRuby.parse(source)
-  generated = Unparser.unparse(node)
-  unparsed  = Parser::CurrentRuby.parse(generated)
-  unless unparsed == node
-    $stderr.puts 'Node:'
-    $stderr.puts node.inspect
-    $stderr.puts 'Unparsed-Node:'
-    $stderr.puts unparsed.inspect
-    $stderr.puts 'Original:'
-    $stderr.puts source
-    $stderr.puts 'Generated:'
-    $stderr.puts generated
-    fail 'BUG!'
-  end
-end

data/lib/unparser/emitter/literal/composed.rb

@@ -1,64 +0,0 @@
-module Unparser
-  class Emitter
-    class Literal
-
-      # Emitter for hash keyvalue pair
-      class HashPair < self
-        HASHROCKET = ' => '.freeze
-
-        handle :pair
-
-      private
-
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          delimited(children, HASHROCKET)
-        end
-
-      end # HashPair
-
-      # Base class for compound literal emitters
-      class Compound < self
-
-      private
-
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          util = self.class
-          parentheses(util::OPEN, util::CLOSE) do
-            delimited(children, util::DELIMITER)
-          end
-        end
-
-        # Hash literal emitter
-        class Hash < self
-          OPEN      = '{'.freeze
-          CLOSE     = '}'.freeze
-          DELIMITER = ', '.freeze
-
-          handle :hash
-        end # Hash
-
-        # Array literal emitter
-        class Array < self
-          OPEN      = '['.freeze
-          CLOSE     = ']'.freeze
-          DELIMITER = ', '.freeze
-
-          handle :array
-        end # Array
-
-      end # Compound
-    end # Literal
-  end # Emitter
-end # Unparser

data/spec/unit/unparser/comments/skip_eol_comment_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-require 'parser/current'
-
-describe Unparser::Comments, '#skip_eol_comment' do
-
-  let(:ast_and_comments) do
-    Parser::CurrentRuby.parse_with_comments(<<-RUBY)
-      def hi # comment
-      end # comment
-    RUBY
-  end
-  let(:ast)              { ast_and_comments[0] }
-  let(:comments)         { ast_and_comments[1] }
-  let(:object)           { described_class.new(comments) }
-
-  it 'should skip the specified comment only for one subsequent take' do
-    object.consume(ast, :name)
-    object.skip_eol_comment('# comment')
-    expect(object.take_eol_comments).to eql([])
-    object.consume(ast, :end)
-    expect(object.take_eol_comments).to eql([comments[1]])
-  end
-
-  it 'should not skip comments with different text' do
-    object.skip_eol_comment('# not the comment')
-    object.consume(ast, :end)
-    expect(object.take_eol_comments).to eql(comments)
-  end
-end