unparser 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6b34a335d81e60393e168fed525e222b2c5300
-  data.tar.gz: dafb68722a32c72bd1200db7b92a1a6477f54c95
+  metadata.gz: b62c76f077c1633ea95d4b674eef40c4862bd841
+  data.tar.gz: 77d01fff24751db00c267068880942f8df8a588a
 SHA512:
-  metadata.gz: 77fda7c1b4c35dfad959a0a9c47bc9f5cdaae335fb3d302bb4b3f0e683c9733e6c6005ffe2495f0c91c0bf5d39e1b173bf99e1c918d13ef6f622d73079e4c534
-  data.tar.gz: b0252bbfb29b1c29b7e1de2fc7dd3719288c5b8227684558e7db7bc2c2cb347863123a10131a52c8ea6c2261a88879d6d64aec347189f68b09a7356a8e03531d
+  metadata.gz: e0cf99eb3262e4d55e8899a1c924d5388cdb55d5991ce33da2ac2717a9cdf8c9bccabaf56c316c8615184627ede859e2cdbfe2472507a7d6985c7ead2e57c26f
+  data.tar.gz: 7b78d0c2cdedf07d26f7f7f166587a08f2142be202de2fe1bba51b6ce3a12aff60f0abdb8164342b4b7ae3c516959ae580e83c33e266263c46b6d5e2bdd584a7

data/.gitignore

@@ -1,2 +1,38 @@
-/tmp
-/Gemfile.lock
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.sw[op]
+
+## Rubinius
+*.rbc
+.rbx
+
+## PROJECT::GENERAL
+*.gem
+coverage
+profiling
+turbulence
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.lock
+
+## PROJECT::SPECIFIC
+/vendor

data/.travis.yml

@@ -3,12 +3,9 @@ script: 'bundle exec rake spec'
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - jruby-head
-  - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+  - ruby
+  - jruby
+  - rbx
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,10 @@
+# v0.1.6 2013-12-31
+
+* Emit 1.9 style hashes where possible: https://github.com/mbj/unparser/pull/23
+* Fix invalid quoting of hash keys: https://github.com/mbj/unparser/issues/22
+* Fix crash on take before introduced by code refactorings: https://github.com/mbj/unparser/issues/20
+* Fix crash on comment reproduction https://github.com/mbj/unparser/issues/17
+
 # v0.1.5 2013-11-01
 
 * Fix crash with comment reproduction.

data/Gemfile

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.devtools

@@ -4,21 +4,24 @@ group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
   gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.2.0'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-  gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard',         '~> 2.2.4'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.0'
+  gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'listen',     '~> 1.3.0'
+  gem 'listen',     '~> 2.4.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -32,24 +35,26 @@ end
 group :metrics do
   gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
+  gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.14.1'
-  gem 'simplecov', '~> 0.7.1'
+  gem 'rubocop',   '~> 0.16.0'
+  gem 'simplecov', '~> 0.8.2'
   gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
+    gem 'mutant',          '~> 0.3.0', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
+
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4.10'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
 end
 
 group :benchmarks do
   gem 'rbench', '~> 0.2.3'
 end
-
-platform :jruby do
-  group :jruby do
-    gem 'jruby-openssl', '~> 0.8.5'
-  end
-end

data/README.md

@@ -7,11 +7,10 @@ unparser
 
 Generate equivalent source for ASTs from whitequarks awesome [parser](https://github.com/whitequark/parser).
 
-This library is in early development stage and still has some bugs/missing features.
-Nevertheless it is able to regenerate it own source and serves well for
-[mutant](https://github.cm/mbj/mutant) mutators and the in-memory vendoring for self hosting mutant.
+This library is able to reproduce 100% of ruby 1.9 and 2.0 syntax. Including its own source code.
+It serves well for [mutant](https://github.cm/mbj/mutant) mutators and the in-memory vendoring for self hosting.
 
-This library dropped the reproduction of 1.8 syntax in the 0.1.0 release.
+This library dropped the reproduction of 1.8 syntax in the 0.1.0 release. It currently does not have support for 2.1 specific syntax.
 
 Usage
 -----

data/TODO

@@ -1,3 +1,4 @@
-* Refactor Emitter::Send, it is ugly.
+* Create an AST preprocessor that creates virtual nodes,
+  removing the need for explicit backreferencing and special cases in the emitter
+  classes.
 * Remove duplicated logic with empty or non empty bodies
-* Handle kwbegin and begin separately

data/bin/unparser

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+trap('INT') do |status|
+  exit! 128 + status
+end
+
+require 'unparser/cli'
+
+exit Unparser::CLI.run(ARGV)

data/circle.yml

@@ -1,4 +1,6 @@
 ---
+ruby:
+  version: 2.0.0-p353
 test:
   override:
     - bundle exec rake ci

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 410
+total_score: 497

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 13.1
+threshold: 24.5

data/config/reek.yml

@@ -36,8 +36,13 @@ LongParameterList:
 FeatureEnvy:
   exclude:
   - Unparser::Emitter::Literal::Regexp#escape # TODO Fixme!
+  - Unparser::Emitter::Send::Arguments#effective_arguments # False positive
   - Unparser::Emitter::Send#binary_receiver?
   - Unparser::Emitter#visit_terminated
+  - Unparser::CLI#add_options
+  - Unparser::CLI::Source#error_report
+  - Unparser::CLI::Preprocessor::Dstr#collapsed_children
+  - Unparser::Comments#take_before
   enabled: true
 ClassVariable:
   exclude: []
@@ -60,11 +65,15 @@ NestedIterators:
   exclude:
   - Unparser::Emitter#self.children
   - Unparser::Emitter::Literal::Regexp#dispatch
+  - Unparser::Emitter::Return#emit_break_return_arguments
+  - Unparser::CLI::Preprocessor::Dstr#collapsed_children
   enabled: true
   max_allowed_nesting: 1
 TooManyStatements:
   max_statements: 6
   enabled: true
+  exclude:
+  - Unparser::CLI::Source#error_report
 DuplicateMethodCall:
   allow_calls: []
   exclude: []
@@ -91,6 +100,7 @@ RepeatedConditional:
   - Unparser::Comments # FIXME
   - Unparser::Emitter::Send # TODO Fixme
   - Unparser::Emitter::If
+  - Unparser::CLI # False positive
   enabled: true
   max_ifs: 1
 DataClump:

data/config/rubocop.yml

@@ -28,21 +28,12 @@ CollectionMethods:
     find:     'detect'
     find_all: 'select'
 
-# Do not force public/protected/private keyword to be indented at the same
-# level as the def keyword. My personal preference is to outdent these keywords
-# because I think when scanning code it makes it easier to identify the
-# sections of code and visually separate them. When the keyword is at the same
-# level I think it sort of blends in with the def keywords and makes it harder
-# to scan the code and see where the sections are.
-AccessControl:
-  Enabled: false
-
 # Limit line length
 LineLength:
   Max: 113  # TODO: lower to 79 once the rubocop branch in shared/Gemfile is removed
 
 ClassLength:
-  Max: 196
+  Max: 204
 
 # Disabled because of indenting with private keyword in class bodies.
 IndentationWidth:
@@ -52,13 +43,6 @@ IndentationWidth:
 SignalException:
   Enabled: false
 
-# Disable Symbol cop because unparse has to prodice "WIERD" symbols in his specs
-#
-# I'd love I could ignore a specific occurance.
-#
-SymbolName:
-  Enabled: false
-
 # False positive in unparser source
 OneLineConditional:
   Enabled: false
@@ -89,3 +73,11 @@ TrivialAccessors:
 # Do not prefer do/end over {} for multiline blocks
 Blocks:
   Enabled: false
+
+# I like to have an empty line before closing the currently opened body
+EmptyLinesAroundBody:
+  Enabled: false
+
+# I like my style more
+AccessModifierIndentation:
+  Enabled: false

data/lib/unparser.rb

@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'abstract_type'
+require 'procto'
 require 'concord'
 require 'parser/all'
 
@@ -47,6 +50,7 @@ module Unparser
 end # Unparser
 
 require 'unparser/buffer'
+require 'unparser/node_helpers'
 require 'unparser/comments'
 require 'unparser/constants'
 require 'unparser/emitter'
@@ -55,7 +59,8 @@ require 'unparser/emitter/literal/primitive'
 require 'unparser/emitter/literal/singleton'
 require 'unparser/emitter/literal/dynamic'
 require 'unparser/emitter/literal/regexp'
-require 'unparser/emitter/literal/composed'
+require 'unparser/emitter/literal/array'
+require 'unparser/emitter/literal/hash'
 require 'unparser/emitter/literal/range'
 require 'unparser/emitter/literal/dynamic_body'
 require 'unparser/emitter/literal/execute_string'
@@ -64,6 +69,8 @@ require 'unparser/emitter/send/unary'
 require 'unparser/emitter/send/binary'
 require 'unparser/emitter/send/index'
 require 'unparser/emitter/send/regular'
+require 'unparser/emitter/send/arguments'
+require 'unparser/emitter/send/attribute_assignment'
 require 'unparser/emitter/block'
 require 'unparser/emitter/assignment'
 require 'unparser/emitter/variable'

data/lib/unparser/buffer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
 
   # Buffer used to emit into

data/lib/unparser/cli.rb

@@ -0,0 +1,113 @@
+# encoding: utf-8
+
+require 'unparser'
+require 'mutant'
+require 'optparse'
+
+require 'unparser/cli/preprocessor'
+require 'unparser/cli/source'
+require 'unparser/cli/differ'
+
+module Unparser
+  # Unparser CLI implementation
+  class CLI
+
+    EXIT_SUCCESS = 0
+    EXIT_FAILURE = 1
+
+    # Run CLI
+    #
+    # @param [Array<String>] arguments
+    #
+    # @return [Fixnum]
+    #   the exit status
+    #
+    # @api private
+    #
+    def self.run(*arguments)
+      new(*arguments).exit_status
+    end
+
+    # Initialize object
+    #
+    # @param [Array<String>] arguments
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def initialize(arguments)
+      @sources = []
+
+      @success   = true
+      @fail_fast = false
+
+      opts = OptionParser.new do |builder|
+        add_options(builder)
+      end
+
+      file_names = opts.parse!(arguments)
+
+      file_names.each do |file_name|
+        @sources << Source::File.new(file_name)
+      end
+    end
+
+    # Add options
+    #
+    # @param [Optparse::Builder] builder
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def add_options(builder)
+      builder.banner = 'usage: unparse [options] FILE [FILE]'
+      builder.separator('')
+      builder.on('-e', '--evaluate SOURCE') do |original_source|
+        @sources << Source::String.new(original_source)
+      end
+      builder.on('--fail-fast') do
+        @fail_fast = true
+      end
+    end
+
+    # Return exit status
+    #
+    # @return [Fixnum]
+    #
+    # @api private
+    #
+    def exit_status
+      @sources.each do |source|
+        process_source(source)
+        if @fail_fast
+          break unless @success
+        end
+      end
+
+      @success ? EXIT_SUCCESS : EXIT_FAILURE
+    end
+
+  private
+
+    # Process source
+    #
+    # @param [CLI::Source]
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def process_source(source)
+      if source.success?
+        puts "Success: #{source.identification}"
+      else
+        puts source.error_report
+        puts "Error: #{source.identification}"
+        @success = false
+      end
+    end
+
+  end # CLI
+end # Unparser