zapata 0.1.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c3475c7d502d650c69c037d6562e5d1338bfb9ce
-  data.tar.gz: 0984b1da3314fa05a9121bc2968125434ed965fd
+SHA256:
+  metadata.gz: 0b1ea03ef4de0c3815e64a5cde304b8659c8e1a2663e7c9704700429fa2810c9
+  data.tar.gz: b8eedb3037467a77a401db9479b26c999147534d7650111184093e5a35957208
 SHA512:
-  metadata.gz: fac18c00c0f6b27eabe027d7fc4c54559e3d6534ee2d4f6c9d7a5ad1ec7167e1076ee8035420325e4951bcf0fcf33402572567b1453541526837a0c19432c880
-  data.tar.gz: 1b377f33bd276784085e940f86da246213eea2f52b0e33ea46f947de838887dd7edb7c2a6da22e9e3d872a8457a08320b988c81e19a5bce1fee5688b46bbac0f
+  metadata.gz: fb60553b3987fe0b49b80414f8723b2c4dbac31c1b5c67c44361b07fe9ffebfce066fa3ee47a76f98ab1ef7b8559c2fb6763d60888048ed053b729d14949528a
+  data.tar.gz: 6224d6f4fd414d2a7e6bf0088b1fde660648d8b2fcc146c78d00ddce5629d6ae89953a071f6ee457f6c57e5e09fc8cfe4f1f1adfbe0b79b850f70f48672fa4f9

data/.gitignore

@@ -13,3 +13,10 @@
 *.o
 *.a
 mkmf.log
+
+.rspec_status
+gemfiles/*.lock
+spec/support/rails_test_app/db/*.sqlite3
+spec/support/rails_test_app/db/*.sqlite3-journal
+spec/support/rails_test_app/log/*.log
+spec/support/rails_test_app/tmp/

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --warnings
 --require spec_helper
+--pattern "spec/*_spec.rb"

data/.rubocop.yml

@@ -0,0 +1,35 @@
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - 'spec/support/rails_test_app/**/*'
+
+Style/Documentation:
+  Enabled: false
+
+Layout/ParameterAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Layout/MultilineOperationIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/CaseIndentation:
+  Enabled: true
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+Style/EmptyMethod:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+    - 'zapata.gemspec'

data/.travis.yml

@@ -1,23 +1,17 @@
 language: ruby
-
-bundler_args: --without development
-
 script: script/test
-gemfile: spec/support/rails_test_app/Gemfile
-
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - ruby-head
-  - jruby-head
-  - rbx
-
+  - 2.3.8
+  - 2.4.8
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
+gemfile:
+  - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx
-
-branches:
-  only:
-    - master
+  exclude:
+  - rvm: 2.3.8
+    gemfile: gemfiles/6.0.gemfile
+  - rvm: 2.4.8
+    gemfile: gemfiles/6.0.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+appraise '5.2' do
+  gem 'rails', '~> 5.2.0'
+  gem 'sqlite3'
+end
+
+appraise '6.0' do
+  gem 'rails', '~> 6.0.0'
+  gem 'sqlite3'
+end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in zapata.gemspec

data/README.md

@@ -7,7 +7,6 @@ themselves.
 [![Build Status](http://img.shields.io/travis/Nedomas/zapata.svg?style=flat)][travis]
 [![Dependency Status](http://img.shields.io/gemnasium/Nedomas/zapata.svg?style=flat)][gemnasium]
 [![Coverage Status](http://img.shields.io/coveralls/Nedomas/zapata/master.svg?style=flat)][coveralls]
-[![Code Climate](http://img.shields.io/codeclimate/github/Nedomas/zapata.svg?style=flat)][codeclimate]
 
 ![Emiliano Zapata](https://cloud.githubusercontent.com/assets/1877286/3753719/af3bfec2-1814-11e4-8790-242c2b26a8e9.jpg)
 
@@ -208,7 +207,7 @@ Also - thank you [@edgibbs](https://github.com/edgibbs), for being the early con
 [@morron](https://github.com/morron) - for caring.
 
 ## Copyright
-Copyright (c) 2014-2016 Justas, Andrew, Ed, Dmitry, Domas.
+Copyright (c) 2014-2018 Justas, Andrew, Ed, Dmitry, Domas.
 See [LICENSE](LICENSE) for details.
 
 [rubygems]: https://rubygems.org/gems/zapata

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'

data/bin/zapata

@@ -1,32 +1,9 @@
 #!/usr/bin/env ruby
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+# frozen_string_literal: true
 
-require_relative '../lib/zapata'
+require 'rubygems'
+require 'bundler/setup'
+require 'zapata'
+require 'zapata/cli'
 
-description_of_generate = "'zapata generate <filename>'
-             -s, --single option to skip app/models analysis"
-
-slop = Slop.new(help: true, banner: true) do
-  banner('Usage: zapata [options]')
-  on :v, :version, 'Print version.' do
-    puts "Your version is #{Zapata::VERSION}"
-  end
-
-  command('generate', description: description_of_generate) do
-    on(:s, :single, "Does not analyze 'app/models'", banner: true)
-
-    run do |opts, args|
-      Zapata::Revolutionist.generate_with_friendly_output(args, opts)
-    end
-  end
-
-  run do |opts, args|
-    if args.present?
-      Zapata::Revolutionist.generate_with_friendly_output(args, opts)
-    end
-  end
-end
-
-puts slop.help if ARGV.empty?
-slop.parse
+Zapata::CLI.start(ARGV)

data/gemfiles/5.2.gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.2.0'
+gem 'sqlite3'
+
+group :test do
+  gem 'coveralls', require: false
+end
+
+gemspec path: '../'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+gem 'sqlite3'
+
+group :test do
+  gem 'coveralls', require: false
+end
+
+gemspec path: '../'

data/lib/zapata.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require 'parser/current'
 require 'unparser'
+require 'tempfile'
 require 'rails'
-require 'require_all'
-require 'file/temp'
 require 'open3'
 require 'rspec'
 require 'memoist'
-require 'slop'
 
-require_rel 'zapata/core'
-require_rel 'zapata/predictor'
-require_rel 'zapata/primitive'
-require_rel 'zapata/rzpec'
+require_relative 'zapata/core'
+require_relative 'zapata/predictor'
+require_relative 'zapata/primitive'
+require_relative 'zapata/rzpec/runner'
+require_relative 'zapata/rzpec/writer'
 require_relative 'zapata/analyst'
 require_relative 'zapata/diver'
 require_relative 'zapata/db'
@@ -23,15 +24,13 @@ module Zapata
     class << self
       attr_accessor :analysis, :analysis_as_array
 
-      def generate_with_friendly_output(args, opts)
-        file = args.shift
-        spec_filename = Zapata::Revolutionist.generate(file,
-          single: single?(opts, args))
+      def generate_with_friendly_output(filename:, single: false)
+        spec_filename = Zapata::Revolutionist.generate(filename: filename, single: single)
         puts "Its done, comrades. File #{spec_filename} was generated."
       end
 
-      def generate(filename, single: false)
-        dirs = single ? [] : %w(app/models)
+      def generate(filename:, single: false)
+        dirs = single ? [] : %w[app/models]
         file_list = Core::Collector.expand_dirs_to_files(dirs)
         new(file_list).generate_rspec_for(filename, spec_filename(filename))
       end
@@ -65,8 +64,8 @@ module Zapata
       end
     end
 
-    def adjusted_current(i, total)
-      "#{i + 1}".rjust(total.size)
+    def adjusted_current(index, total)
+      (index + 1).to_s.rjust(total.size)
     end
 
     def generate_rspec_for(filename, spec_filename)
@@ -80,15 +79,16 @@ module Zapata
 
       global_analysis = Revolutionist.analysis_as_array
       # first run
-      tmp_spec_filename = File::Temp.new(false).path
-      RZpec::Writer.new(tmp_spec_filename, code, self.class.analysis[filename], global_analysis)
+      Tempfile.open('spec') do |tempfile|
+        RZpec::Writer.new(tempfile.path, code, self.class.analysis[filename], global_analysis)
 
-      save_spec_file(tmp_spec_filename, spec_filename)
-      spec_analysis = RZpec::Runner.new(spec_filename)
+        save_spec_file(tempfile.path, spec_filename)
+        spec_analysis = RZpec::Runner.new(spec_filename)
 
-      # second run with RSpec results
-      RZpec::Writer.new(tmp_spec_filename, code, self.class.analysis[filename], global_analysis, spec_analysis)
-      save_spec_file(tmp_spec_filename, spec_filename)
+        # second run with RSpec results
+        RZpec::Writer.new(tempfile.path, code, self.class.analysis[filename], global_analysis, spec_analysis)
+        save_spec_file(tempfile.path, spec_filename)
+      end
     end
 
     def save_spec_file(tmp_spec_filename, spec_filename)

data/lib/zapata/analyst.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zapata
   class Analyst
     attr_reader :result

data/lib/zapata/cli.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'thor'
+require_relative 'version'
+
+module Zapata
+  class CLI < Thor
+    desc 'generate FILENAME', 'Generate spec file for model'
+    option :single, type: :boolean,
+                    desc: 'Skip app/models analysis',
+                    aliases: :s
+    def generate(filename)
+      Zapata::Revolutionist.generate_with_friendly_output(
+        filename: filename, single: options[:single]
+      )
+    end
+
+    desc 'version', 'Shows zapata version'
+    def version
+      puts "v#{Zapata::VERSION}"
+    end
+  end
+end

data/lib/zapata/core.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'core/collector'
+require_relative 'core/loader'
+require_relative 'core/reader'
+require_relative 'core/writer'
+
+module Zapata
+  module Core
+  end
+end

data/lib/zapata/core/collector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zapata
   module Core
     class Collector

data/lib/zapata/core/loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zapata
   module Core
     class Loader
@@ -7,11 +9,11 @@ module Zapata
         end
 
         def rails_helper_path
-          File.expand_path("#{spec_dir}/rails_helper",  __FILE__)
+          File.expand_path("#{spec_dir}/rails_helper", __FILE__)
         end
 
         def spec_helper_path
-          File.expand_path("#{spec_dir}/spec_helper",  __FILE__)
+          File.expand_path("#{spec_dir}/spec_helper", __FILE__)
         end
 
         def helper_name
@@ -27,7 +29,7 @@ module Zapata
         def full_helper_path
           paths = {
             rails_helper: rails_helper_path,
-            spec_helper: spec_helper_path,
+            spec_helper: spec_helper_path
           }.freeze
 
           paths[helper_name.to_sym]
@@ -35,7 +37,7 @@ module Zapata
 
         def load_spec_helper
           $LOAD_PATH << spec_dir
-          require "#{helper_name}"
+          require helper_name.to_s
         end
       end
     end

data/lib/zapata/core/reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zapata
   module Core
     class Reader

data/lib/zapata/core/writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zapata
   module Core
     class Writer

data/lib/zapata/db.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zapata
   class DB
     @records = []

data/lib/zapata/diver.rb

@@ -1,37 +1,39 @@
+# frozen_string_literal: true
+
 module Zapata
-  RETURN_TYPES = %i(missing raw const_send sym float str int ivar true false const nil)
-  FINAL_TYPES = Zapata::RETURN_TYPES + %i(array hash)
-  DIVE_TYPES = %i(args begin block defined? nth_ref splat kwsplat class
-    block_pass sclass masgn or and irange erange when and
-    return array kwbegin yield while dstr ensure pair)
-  ASSIGN_TYPES = %i(ivasgn lvasgn or_asgn casgn optarg)
-  DEF_TYPES = %i(def defs)
-  HARD_TYPES = %i(if dsym resbody mlhs next self break zsuper
-    super retry rescue match_with_lvasgn case op_asgn regopt regexp)
+  RETURN_TYPES = %i[missing raw const_send sym float str int ivar true false const nil].freeze
+  FINAL_TYPES = Zapata::RETURN_TYPES + %i[array hash]
+  DIVE_TYPES = %i[args begin block defined? nth_ref splat kwsplat class
+                  block_pass sclass masgn or and irange erange when and
+                  return array kwbegin yield while dstr ensure pair].freeze
+  ASSIGN_TYPES = %i[ivasgn lvasgn or_asgn casgn optarg].freeze
+  DEF_TYPES = %i[def defs].freeze
+  HARD_TYPES = %i[if dsym resbody mlhs next self break zsuper
+                  super retry rescue match_with_lvasgn case op_asgn regopt regexp].freeze
   TYPES_BY_SEARCH_FOR = {
-    klass: %i(class),
+    klass: %i[class],
     var: ASSIGN_TYPES,
     def: DEF_TYPES,
-    send: %i(send),
-  }
+    send: %i[send]
+  }.freeze
 
   PRIMITIVE_TYPES = {
-    Def: %i(def),
-    Defs: %i(defs),
-    Send: %i(send),
-    Array: %i(args array),
-    Hash: %i(hash),
-    Ivar: %i(ivar),
-    Lvar: %i(lvar),
-    Klass: %i(class),
-    Sklass: %i(sclass),
-    Modul: %i(module),
-    Const: %i(const),
-    Optarg: %i(optarg),
-    Arg: %i(arg),
+    Def: %i[def],
+    Defs: %i[defs],
+    Send: %i[send],
+    Array: %i[args array],
+    Hash: %i[hash],
+    Ivar: %i[ivar],
+    Lvar: %i[lvar],
+    Klass: %i[class],
+    Sklass: %i[sclass],
+    Modul: %i[module],
+    Const: %i[const],
+    Optarg: %i[optarg],
+    Arg: %i[arg],
     Basic: RETURN_TYPES,
-    Casgn: %i(casgn),
-    Var: ASSIGN_TYPES,
+    Casgn: %i[casgn],
+    Var: ASSIGN_TYPES
   }.freeze
 
   class Diver
@@ -45,7 +47,9 @@ module Zapata
 
       def dive(code)
         return Primitive::Nil.new unless code
-        return Primitive::Raw.new(:missing, :hard_type) if HARD_TYPES.include?(code.type)
+        if HARD_TYPES.include?(code.type)
+          return Primitive::Raw.new(:missing, :hard_type)
+        end
 
         if (klass = primitive_klass(code))
           result = klass.new(code)