transpec 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1cbae52577334b666b5a02f1c926f8a8ca1af16
-  data.tar.gz: 181c31e4d34c5b5f4e966d0627fb30fa9d875142
+  metadata.gz: 59870e21327ecc3a1a3a436db95ed2f6ba446a66
+  data.tar.gz: dbb7b187b7a2d0224727c8bad33ff25e26cb9fe5
 SHA512:
-  metadata.gz: 1d41de85a3be6bb7e6d271c170c169358a46a8501e52023b13a1fc74df4633c5be597798359312e805666156e85119b6911d712981ca35fd1a3c8105c616f468
-  data.tar.gz: c0970c8ed8a6daefe39fc0bf136d54d58872255d0dfdaef1ebf4aff500fd1511e369af3c0c06f81c52153ca5cbcc29a12a884380a59256fff8f9274e4c533cf4
+  metadata.gz: 407da45de0345dd8d3e3e857b4e02038aa9c8d379d9dc49c49ae30cb100ba0ade7d82a3cf348001b59c9c0d15debea59203ec0a034fd59039e34895aca80a5d9
+  data.tar.gz: 8584f6ffac8f1157e9e78ca6f1d158cc67f603f669480f400c16c8e9f8ea8425f508d65a78a5d3ef8b88072c4df67012cdad477faebd69b31091b2975e6665e2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Development
 
+## v1.2.2
+
+* Fix error `singleton can't be dumped (TypeError)` at the end of dynamic analysis ([#17](https://github.com/yujinakayama/transpec/issues/17))
+* Do not copy pseudo files (device, socket, etc.) in dynamic analysis ([#17](https://github.com/yujinakayama/transpec/issues/17))
+* Fix error `undefined method receive_messages_available?` while conversion ([#17](https://github.com/yujinakayama/transpec/issues/17))
+
 ## v1.2.1
 
 * Apply `-p/--no-parentheses-matcher-arg` to the conversion of `have(n).items` (`obj.should have(n).items` is now converted to `expect(obj.size).to eq n` with `-p/--no-parentheses-matcher-arg`)

data/README.md

@@ -2,9 +2,9 @@
 
 # Transpec
 
-**Transpec** automatically converts your specs into latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
+**Transpec** automatically converts your specs into the latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
 
-This aims to facilitate smooth transition to RSpec 3, and is now ready for RSpec 2.99 and 3.0 beta!
+This aims to facilitate smooth transition to RSpec 3, and it's now ready for RSpec 2.99 and 3.0 beta!
 
 See the following pages for the new RSpec syntax and the plan for RSpec 3:
 
@@ -154,6 +154,12 @@ $ git commit -eF .git/COMMIT_EDITMSG
 
 And you are done!
 
+## Upgrade Process to RSpec 3 beta
+
+If you are going to use Transpec in the upgrade process to RSpec 3 beta, read the article by [Myron Marston](https://github.com/myronmarston):
+
+* [Myron Marston » RSpec 2.99 and 3.0 betas have been released!](http://myronmars.to/n/dev-blog/2013/11/rspec-2-99-and-3-0-betas-have-been-released)
+
 ## Options
 
 ### `-f/--force`

data/README.md.erb

@@ -2,9 +2,9 @@
 
 # Transpec
 
-**Transpec** automatically converts your specs into latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
+**Transpec** automatically converts your specs into the latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
 
-This aims to facilitate smooth transition to RSpec 3, and is now ready for RSpec 2.99 and 3.0 beta!
+This aims to facilitate smooth transition to RSpec 3, and it's now ready for RSpec 2.99 and 3.0 beta!
 
 See the following pages for the new RSpec syntax and the plan for RSpec 3:
 
@@ -127,6 +127,12 @@ $ git commit -eF .git/COMMIT_EDITMSG
 
 And you are done!
 
+## Upgrade Process to RSpec 3 beta
+
+If you are going to use Transpec in the upgrade process to RSpec 3 beta, read the article by [Myron Marston](https://github.com/myronmarston):
+
+* [Myron Marston » RSpec 2.99 and 3.0 betas have been released!](http://myronmars.to/n/dev-blog/2013/11/rspec-2-99-and-3-0-betas-have-been-released)
+
 ## Options
 
 ### `-f/--force`

data/lib/transpec.rb

@@ -16,7 +16,7 @@ module Transpec
       if rspec_dependency
         rspec_requirement = rspec_dependency.requirement
         gem_version = rspec_requirement.requirements.first.find { |r| r.is_a?(Gem::Version) }
-        RSpecVersion.new(gem_version.to_s)
+        RSpecVersion.new(gem_version)
       else
         # Using development version of RSpec with Bundler.
         current_rspec_version

data/lib/transpec/commit_message.rb

@@ -13,7 +13,7 @@ module Transpec
       conversion_summary = @report.summary(bullet: '*', separate_by_blank_line: true)
 
       <<-END.gsub(/^\s+\|/, '').chomp
-        |Convert specs to latest RSpec syntax with Transpec
+        |Convert specs to the latest RSpec syntax with Transpec
         |
         |This conversion is done by Transpec #{Transpec::Version} with the following command:
         |    transpec #{@cli_args.join(' ')}

data/lib/transpec/dynamic_analyzer.rb

@@ -5,8 +5,9 @@ require 'transpec/dynamic_analyzer/runtime_data'
 require 'transpec/file_finder'
 require 'transpec/project'
 require 'tmpdir'
+require 'find'
+require 'pathname'
 require 'fileutils'
-require 'ostruct'
 require 'shellwords'
 require 'English'
 
@@ -15,10 +16,10 @@ module Transpec
     EVAL_TARGET_TYPES = [:object, :context]
     ANALYSIS_METHOD = 'transpec_analysis'
     HELPER_FILE = 'transpec_analysis_helper.rb'
-    RESULT_FILE = 'transpec_analysis_result.dump'
+    RESULT_FILE = 'transpec_analysis_result.json'
     HELPER_SOURCE = <<-END
-      require 'ostruct'
       require 'pathname'
+      require 'json'
 
       module TranspecAnalysis
         @base_path = Dir.pwd
@@ -38,9 +39,14 @@ module Transpec
         end
 
         at_exit do
+          # Use JSON rather than Marshal so that:
+          # * Unknown third-party class information won't be serialized.
+          #   (Such objects are stored as a string.)
+          # * Singleton method information won't be serialized.
+          #   (With Marshal.load, `singleton can't be dumped (TypeError)` will be raised.)
           path = File.join(@base_path, '#{RESULT_FILE}')
           File.open(path, 'w') do |file|
-            Marshal.dump(data, file)
+            JSON.dump(data, file)
           end
         end
       end
@@ -52,12 +58,12 @@ module Transpec
                    when :context then context
                    end
 
-          eval_data = OpenStruct.new
+          eval_data = {}
 
           begin
-            eval_data.result = target.instance_eval(code)
+            eval_data[:result] = target.instance_eval(code)
           rescue Exception => error
-            eval_data.error = error
+            eval_data[:error] = error
           end
 
           [key, eval_data]
@@ -112,8 +118,7 @@ module Transpec
         run_rspec(paths)
 
         File.open(RESULT_FILE) do |file|
-          hash = Marshal.load(file)
-          RuntimeData.new(hash)
+          RuntimeData.load(file)
         end
       end
     end
@@ -124,7 +129,7 @@ module Transpec
       @in_copied_project = true
 
       Dir.mktmpdir do |tmpdir|
-        FileUtils.cp_r(@project.path, tmpdir)
+        copy_recursively(@project.path, tmpdir)
         @copied_project_path = File.join(tmpdir, @project.basename)
         Dir.chdir(@copied_project_path) do
           yield
@@ -156,5 +161,45 @@ module Transpec
         end
       end
     end
+
+    def copy_recursively(source_root, destination_root)
+      source_root = File.expand_path(source_root)
+      source_root_pathname = Pathname.new(source_root)
+
+      destination_root = File.expand_path(destination_root)
+      if File.directory?(destination_root)
+        destination_root = File.join(destination_root, File.basename(source_root))
+      end
+
+      Find.find(source_root) do |source_path|
+        relative_path = Pathname.new(source_path).relative_path_from(source_root_pathname).to_s
+        destination_path = File.join(destination_root, relative_path)
+        copy(source_path, destination_path)
+      end
+    end
+
+    private
+
+    def copy(source, destination)
+      if File.symlink?(source)
+        File.symlink(File.readlink(source), destination)
+      elsif File.directory?(source)
+        FileUtils.mkdir_p(destination)
+      elsif File.file?(source)
+        FileUtils.copy_file(source, destination)
+      end
+
+      copy_permission(source, destination) if File.exist?(destination)
+    end
+
+    def copy_permission(source, destination)
+      source_mode = File.lstat(source).mode
+      begin
+        File.lchmod(source_mode, destination)
+      rescue NotImplementedError, Errno::ENOSYS
+        # Should not change mode of symlink's destination.
+        File.chmod(source_mode, destination) unless File.symlink?(destination)
+      end
+    end
   end
 end

data/lib/transpec/dynamic_analyzer/runtime_data.rb

@@ -1,18 +1,26 @@
 # coding: utf-8
 
+require 'json'
+require 'ostruct'
 require 'pathname'
 
 module Transpec
   class DynamicAnalyzer
     class RuntimeData
-      attr_reader :hash
+      attr_reader :data
 
-      def initialize(hash = {})
-        @hash = hash
+      def self.load(string_or_io)
+        options = { object_class: CompatibleOpenStruct, symbolize_names: true }
+        data = JSON.load(string_or_io, nil, options)
+        new(data)
+      end
+
+      def initialize(data = CompatibleOpenStruct.new)
+        @data = data
       end
 
       def [](node)
-        @hash[node_id(node)]
+        @data[node_id(node)]
       end
 
       def node_id(node)
@@ -22,6 +30,21 @@ module Transpec
         relative_path = Pathname.new(absolute_path).relative_path_from(Pathname.pwd).to_s
         [relative_path, source_range.begin_pos, source_range.end_pos].join('_')
       end
+
+      class CompatibleOpenStruct < OpenStruct
+        # OpenStruct#[] is available from Ruby 2.0.
+        unless method_defined?(:[])
+          def [](key)
+            __send__(key)
+          end
+        end
+
+        unless method_defined?(:[]=)
+          def []=(key, value)
+            __send__("#{key}=", value)
+          end
+        end
+      end
     end
   end
 end

data/lib/transpec/rspec_version.rb

@@ -3,7 +3,11 @@
 require 'transpec'
 
 module Transpec
-  class RSpecVersion < Gem::Version
+  # Gem::Version caches its instances with class variable @@all,
+  # so we should not inherit it.
+  class RSpecVersion
+    include Comparable
+
     # http://www.ruby-doc.org/stdlib-2.0.0/libdoc/rubygems/rdoc/Gem/Version.html
     #
     # If any part contains letters (currently only a-z are supported) then that version is
@@ -11,15 +15,33 @@ module Transpec
     # Prerelease parts are sorted alphabetically using the normal Ruby string sorting rules.
     # If a prerelease part contains both letters and numbers, it will be broken into multiple parts
     # to provide expected sort behavior (1.0.a10 becomes 1.0.a.10, and is greater than 1.0.a9).
-    VERSION_2_99 = new('2.99.aaaaaaaaaa')
-    VERSION_3_0  = new('3.0.aaaaaaaaaa')
+    GEM_VERSION_2_99 = Gem::Version.new('2.99.aaaaaaaaaa')
+    GEM_VERSION_3_0  = Gem::Version.new('3.0.aaaaaaaaaa')
+
+    attr_reader :gem_version
+
+    def initialize(version)
+      @gem_version = if version.is_a?(Gem::Version)
+                       version
+                     else
+                       Gem::Version.new(version)
+                     end
+    end
 
     def be_truthy_available?
-      self >= VERSION_2_99
+      @gem_version >= GEM_VERSION_2_99
     end
 
     def receive_messages_available?
-      self >= VERSION_3_0
+      @gem_version >= GEM_VERSION_3_0
+    end
+
+    def <=>(other)
+      @gem_version <=> other.gem_version
+    end
+
+    def to_s
+      @gem_version.to_s
     end
   end
 end

data/lib/transpec/syntax/have.rb

@@ -98,8 +98,9 @@ module Transpec
 
       def query_method
         node_data = runtime_node_data(@expectation.subject_node)
-        if node_data
-          (QUERY_METHOD_PRIORITIES & node_data[:available_query_methods].result).first
+        if node_data && node_data[:available_query_methods].result.is_a?(Array)
+          available_query_methods = node_data[:available_query_methods].result.map(&:to_sym)
+          (QUERY_METHOD_PRIORITIES & available_query_methods).first
         else
           default_query_method
         end

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 1
     MINOR = 2
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/support/cache_helper.rb

@@ -48,7 +48,8 @@ module CacheHelper
   def cache_dir
     @cache_dir ||= begin
       project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-      cache_dir = File.join(project_root, 'tmp', 'spec_cache')
+      ruby_version = "#{RUBY_ENGINE}#{RUBY_VERSION}"
+      cache_dir = File.join(project_root, 'tmp', 'spec_cache', ruby_version)
 
       unless Dir.exist?(cache_dir)
         require 'fileutils'

data/spec/transpec/commit_message_spec.rb

@@ -27,7 +27,7 @@ module Transpec
       let(:lines) { commit_message.to_s.lines.to_a }
 
       it 'has concise summary at first line' do
-        lines[0].chomp.should == 'Convert specs to latest RSpec syntax with Transpec'
+        lines[0].chomp.should == 'Convert specs to the latest RSpec syntax with Transpec'
       end
 
       it 'has blank line at second line' do

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -167,14 +167,71 @@ module Transpec
 
         subject(:element) { runtime_data[target_node] }
 
-        it 'is a hash' do
-          should be_a(Hash)
+        it 'is an OpenStruct' do
+          should be_a(OpenStruct)
         end
 
         it 'has result of requested analysis' do
-          element[:available_query_methods].result.should =~ [:size, :count, :length]
+          element[:available_query_methods].result.should =~ %w(size count length)
         end
       end
     end
+
+    describe '#copy_recursively' do
+      it 'copies files recursively' do
+        [
+          'src/file1',
+          'src/file2',
+          'src/dir1/file',
+          'src/dir2/file'
+        ].each do |path|
+          create_file(path, '')
+        end
+
+        dynamic_analyzer.copy_recursively('src', 'dst')
+
+        [
+          'dst/file1',
+          'dst/file2',
+          'dst/dir1/file',
+          'dst/dir2/file'
+        ].each do |path|
+          File.exist?(path).should be_true
+        end
+      end
+
+      it 'copies only directories, files and symlinks' do
+        create_file('src/file', '')
+        File.symlink('file', 'src/symlink')
+        Dir.mkdir('src/dir')
+        system('mkfifo', 'src/fifo')
+
+        dynamic_analyzer.copy_recursively('src', 'dst')
+
+        File.file?('dst/file').should be_true
+        File.symlink?('dst/symlink').should be_true
+        File.directory?('dst/dir').should be_true
+        File.exist?('dst/fifo').should be_false
+      end
+
+      def permission(path)
+        format('%o', File.lstat(path).mode)[-4..-1]
+      end
+
+      it 'preserves permission' do
+        create_file('src/file', '')
+        File.chmod(0755, 'src/file')
+
+        File.symlink('file', 'src/symlink')
+
+        Dir.mkdir('src/dir')
+        File.chmod(0600, 'src/dir')
+
+        dynamic_analyzer.copy_recursively('src', 'dst')
+
+        permission('dst/file').should == '0755'
+        permission('dst/dir').should == '0600'
+      end
+    end
   end
 end

data/tasks/lib/transpec_test.rb

@@ -64,6 +64,13 @@ class TranspecTest
         next if ['.', '..', 'tmp'].include?(entry)
         FileUtils.cp_r(entry, project_dir)
       end
+
+      spec_cache_dir = File.join('tmp', 'spec_cache')
+
+      if Dir.exist?(spec_cache_dir)
+        Dir.mkdir(File.join(project_dir, 'tmp'))
+        FileUtils.cp_r(spec_cache_dir, File.join(project_dir, spec_cache_dir))
+      end
     end
 
     bundle_install

data/tasks/readme.rake

@@ -5,13 +5,6 @@ task :readme do
   require 'erb'
   require 'transpec/cli'
 
-  gem_specification = Gem::Specification.load('transpec.gemspec')
-  rspec_dependency = gem_specification.dependencies.find { |d| d.name == 'rspec' }
-  rspec_requirement = rspec_dependency.requirement
-  # rubocop:disable UselessAssignment
-  rspec_version = rspec_requirement.requirements.first.find { |r| r.is_a?(Gem::Version) }
-  # rubocop:enable UselessAssignment
-
   erb = ERB.new(File.read('README.md.erb'), nil, '-')
   content = erb.result(binding)
   File.write('README.md', content)

data/transpec.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
   spec.summary       = 'A RSpec syntax converter'
-  spec.description   = 'Transpec converts your specs into latest RSpec syntax ' +
+  spec.description   = 'Transpec converts your specs into the latest RSpec syntax ' +
                        'with static and dynamic code analysis.'
   spec.homepage      = 'https://github.com/yujinakayama/transpec'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -164,8 +164,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-description: Transpec converts your specs into latest RSpec syntax with static and
-  dynamic code analysis.
+description: Transpec converts your specs into the latest RSpec syntax with static
+  and dynamic code analysis.
 email:
 - nkymyj@gmail.com
 executables: