crystalize 0.0.1 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d981288d17350603daf3c7000032929215fe58b0e40ef5118e8f1cae33dc07f6
-  data.tar.gz: 3bdb380a82b2d5714f4c2a38eaa6df8ea2ab4df3b357afb1149b678833da0d1b
+  metadata.gz: 76816478d6cbaee2a2885c5520c014236edefef4be3ed0871dab90cfb446faa9
+  data.tar.gz: 3e287f0e4ffe910dbb414960e5a338d696cb7e38d63b26c409491a749f8e766d
 SHA512:
-  metadata.gz: 78637647de7f3d7e056d1c6e004cafb155bacb5578b2880e7ddb8b07519e54428e8bbbdec7ee2a2af7d4dba7f860d59c3065dc8f85c6e0e18cb9c6e6d850eb68
-  data.tar.gz: 52e18a16050a195882cf3fcd38d99412c3b48d9783102f05b2ba0bd40205f9993beffb61b261552cd3c486e0aa6b07fcec9511db848a4bdcd51a4dc766af80e2
+  metadata.gz: cfae3ce689ddf73ca751c88e1db7676253918a8d3422fcfdf8e86f4f275fcf5a6c9bbb83e12c82b0c19ca4ff501e0ea4ca4ab10c517d8b6b8ee4c8652bc6742c
+  data.tar.gz: caac041d3589bd9885f535a7e521d4ab4c2255ba2fadee78d6597a4c96555f27bca23ec6a686fffa832be6a2f2911b25353c50de1599fbb32aa5c8414366b50c

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+0.0.7
+-------
+- Do not transform lambdas to Arrays
+- Update run options
+
+0.0.6
+------
+- Fix core extensions
+- Tests for core extensions
+- Update bin interface
+
+0.0.5
+-----
+- Core extensions
+- Fixes for visibility for `self.methods`
+
+0.0.4
+-----
+- Fix require directive
+
+0.0.3
+------
+- Fixes for bin
+- Improve logic for visibility methods transform
+
+0.0.2 
+-----
+New features:
+- Transform private,public,protected methods in files
+
+0.0.1
+------
+Initial version. Nothing works

data/Gemfile.lock

@@ -1,13 +1,20 @@
 PATH
   remote: .
   specs:
-    crystalize (0.0.1)
+    crystalize (0.0.7)
+      require_all
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
+    require_all (2.0.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -28,8 +35,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   crystalize!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/Rakefile

@@ -1,6 +1,15 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'erb'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+
+task :update_require do
+  File.open("lib/crystalize.rb", "w") do |f|
+    f.write ERB.new(File.read("lib/crystalize.rb.erb")).result(binding)
+  end
+end
+

data/bin/crystalize

@@ -1,2 +1,37 @@
 #!/usr/bin/env ruby
-puts "Hello from crystalize"
+require 'bundler/setup'
+require 'crystalize'
+require 'optionparser'
+
+# Used to parse command line arguments via +OptionParser+
+class ARGVParser
+  # Returns parsed command line +options+
+  # @example
+  #   options = ARGVParser.parse(ARGV)
+  def self.yesno(o, args, key)
+    o == 'yes' ? args[key] = true : args[key] = false
+  end
+
+  def self.parse(options)
+    args = Hash.new
+
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = "Usage: crystalize file_regex [options]"
+      opts.separator ''
+      opts.on('-f', '--files=', 'Regex for Dir')           { |o| args[:files]   = o }
+      opts.on("--transform-literals")                      {|o| args[:transform_literals] = true }
+      opts.on("--transform-private")                       {|o| args[:transform_private] = true }
+      opts.on("--transform-all")                           {|o| args[:transform_all] = true }
+      opts.separator ''
+      opts.on_tail("-h", "--help", "Show this message")    { abort opts.to_s }
+      opts.on_tail("--version", "Show version")    { abort Crystalize::VERSION }
+    end
+
+    opt_parser.parse!(options)
+    args
+  end
+end
+
+files = ARGV.first.start_with?('-') ? [] : ARGV.pop
+options = ARGVParser.parse(ARGV)
+Crystalize::ProjectConverter.new(files, options).convert

data/crystalize.gemspec

@@ -23,7 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency     "require_all"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
 end

data/hashes.rb

@@ -0,0 +1,6 @@
+
+def method
+  puts Hash(Anything, Anything).new.inspect
+end
+
+method

data/lib/crystalize.rb

@@ -1,5 +1,14 @@
-require "crystalize/version"
+ require "crystalize/transform/lines/private_methods"
+ require "crystalize/transform/code/semicolons"
+ require "crystalize/ruby/ruby_core_extensions"
+ require "crystalize/transform/lines/literals"
+ require "crystalize/check/lines/literals"
+ require "crystalize/options_validator"
+ require "crystalize/project_converter"
+ require "crystalize/check/lines/meta"
+ require "crystalize/code_converter"
+ require "crystalize/code_line"
+ require "crystalize/version"
+ require "crystalize/support"
+ require "crystalize/code"
 
-module Crystalize
-  # Your code goes here...
-end

data/lib/crystalize.rb.erb

@@ -0,0 +1,2 @@
+<% Dir['lib/**/*.rb'].map{|f| s = f.split("."); s.pop; s.join(".") }.sort_by(&:size).reverse.reject{|f| f == "lib/crystalize"}.each do |f| %> require "<%= f.split("/")[1..-1].join("/") %>"
+<% end %>

data/lib/crystalize/check/lines/literals.rb

@@ -0,0 +1,9 @@
+module Crystalize
+  module Check
+    module Line
+      module Literals
+
+      end
+    end
+  end
+end

data/lib/crystalize/check/lines/meta.rb

@@ -0,0 +1,15 @@
+module Crystalize
+  module Check
+    module Meta
+      def include_method?(line, method)
+        line.match /[ .(]?#{method}[ .)(]?/
+      end
+
+      def check_metaprogramming_methods(line)
+        methods = []
+        methods.each do |method|
+        end
+      end
+    end
+  end
+end

data/lib/crystalize/code.rb

@@ -0,0 +1,10 @@
+module Crystalize
+  # Class code represents code extracted in file
+  class Code
+    attr_reader :code
+
+    def initialize(code)
+      @code = code
+    end
+  end
+end

data/lib/crystalize/code_converter.rb

@@ -0,0 +1,75 @@
+module Crystalize
+  class CodeConverter
+    # Checks
+    include Check::Line::Literals
+    # include Check::Line::PrivateMethods
+
+    # Transforms
+    include Transform::Line::Literals
+    include Transform::Line::PrivateMethods
+    include Transform::Code::Semicolons
+
+    attr_reader :new_content
+
+    NEWLINE_DELIMITER = "\n"
+    DEFAULT_OPTIONS = {
+        transform_all: true
+    }
+
+    def initialize(options, content)
+      @options = options
+      @content = transform_semicolons(content)
+      @new_content = []
+    end
+
+    def new_content_string
+      @new_content.join(NEWLINE_DELIMITER)
+    end
+
+    def convert
+      # check_by_line
+      check_full
+
+      transform_full
+      @new_content = transform_by_line(@new_content)
+    end
+
+    private
+
+    def by_line content, &block
+      new_content = []
+      content.each do |line|
+        yield new_content, line
+      end
+      new_content
+    end
+
+    def check_by_line(content)
+      by_line(content) do |line|
+
+      end
+    end
+
+    def transform_by_line(content)
+      by_line(content) do |new_content, line|
+        l = line
+        l = transform_array_literal(l) if @options[:transform_literals] || @options[:transform_all]
+        l = transform_hash_literal(l) if @options[:transform_literals] || @options[:transform_all]
+        new_content << l
+      end
+    end
+
+    def check_full
+    end
+
+    def transform_full
+      @new_content = splitted_content
+      @new_content = transform_private_methods(@new_content) if @options[:transform_private] || @options[:transform_all]
+    end
+
+    def splitted_content
+      @content.split(NEWLINE_DELIMITER)
+    end
+
+  end
+end

data/lib/crystalize/code_line.rb

@@ -0,0 +1,10 @@
+module Crystalize
+  # Class code represents code extracted in file
+  class CodeLine
+    attr_reader :line
+
+    def initialize(line)
+      @line = line
+    end
+  end
+end

data/lib/crystalize/options_validator.rb

@@ -0,0 +1,6 @@
+module Crystalize
+  # Validates options for Crystalize::Converter
+  class OptionsValidator
+
+  end
+end

data/lib/crystalize/project_converter.rb

@@ -0,0 +1,21 @@
+module Crystalize
+  class ProjectConverter
+    def initialize(files, options)
+      @files = files
+      @options = options
+    end
+
+    def convert
+      files = @files ? Dir[@files] : []
+      puts "Processing #{files.size} files"
+      files.select{|f| f.end_with?(".rb") }.each do |file|
+        converter =  CodeConverter.new(@options, File.read(file))
+        converter.convert
+        result = converter.new_content_string
+        File.open(file, 'w') {|f| f.write result}
+      end
+      puts "Done"
+    end
+
+  end
+end

data/lib/crystalize/ruby/ruby_core_extensions.rb

@@ -0,0 +1,30 @@
+class Anything < Object; end
+
+def Hash(*args)
+  if args.all?{|arg| arg == Anything}
+    Hash
+  else
+    if args
+      if args.first == nil
+        Hash.new
+      elsif args.first == []
+        Hash.new
+      elsif args.first.instance_of?(Array) && args.first != []
+        raise TypeError
+      else
+        args.first
+      end
+    else
+      Hash.new
+    end
+  end
+end
+
+
+def Array(arg)
+  if arg == Anything
+    Array
+  else
+    arg.respond_to?(:to_a) ? arg.to_a : [arg]
+  end
+end

data/lib/crystalize/support.rb

@@ -0,0 +1,14 @@
+module Crystalize
+  module Support
+    def each_cr_file_line(&block)
+      Dir['./**/**/*.cr'].each do |filename|
+        puts filename
+        content = []
+        File.readlines(filename).each do |line|
+          content << yield(line)
+        end
+        File.open(filename, "w") { |f| content.each do |line| f << line end}
+      end
+    end
+  end
+end

data/lib/crystalize/transform/code/semicolons.rb

@@ -0,0 +1,11 @@
+module Crystalize
+  module Transform
+    module Code
+      module Semicolons
+        def transform_semicolons(code)
+          code.gsub(";", "\n")
+        end
+      end
+    end
+  end
+end

data/lib/crystalize/transform/lines/literals.rb

@@ -0,0 +1,28 @@
+module Crystalize
+  module Transform
+    module Line
+      module Literals
+        def transform_array_literal(line)
+          if lambda_call_in_line?(line)
+            line
+          else
+            line.gsub '[]', "Array(Anything).new"
+          end
+        end
+
+        def transform_hash_literal(line)
+          line.gsub '{}', 'Hash(Anything, Anything).new'
+        end
+
+        def lambda_call_in_line?(line)
+          # Here is omitting calls like
+          # lambda_method       []
+          # due to bad code style of lambda call, even this
+          # lambda call is correct
+          braces = /[\[][ ]*[\]]/
+          line.match /(\w+|[.])#{braces}/
+        end
+      end
+    end
+  end
+end

data/lib/crystalize/transform/lines/private_methods.rb

@@ -0,0 +1,78 @@
+module Crystalize
+  module Transform
+    module Line
+      module PrivateMethods
+        def transform_private_methods(lines)
+          new_lines = []
+          current_visibility = :public
+          non_public_triggered = false
+
+          lines.each do |line|
+            if private_in_line?(line)
+              current_visibility = :private
+              non_public_triggered = true
+            end
+            if protected_in_line?(line)
+              current_visibility = :protected
+              non_public_triggered = true
+            end
+            current_visibility = :public if public_in_line?(line)
+
+            if method_in_line?(line) && !self_method_in_line?(line)
+              new_lines << add_visibility_prefix_to_method(current_visibility, line, non_public_triggered)
+            elsif private_in_line?(line) || protected_in_line?(line) || public_in_line?(line)
+              new_lines << line_without_private(line)
+            else
+              new_lines << line
+            end
+          end
+
+          new_lines
+        end
+
+        def line_without_private(line)
+          ""
+        end
+
+        def add_visibility_prefix_to_method(current_visibility, line, non_public_triggered)
+          if !non_public_triggered && current_visibility == :public
+            line
+          else
+            " "*tabulation(line)+current_visibility.to_s + " "+ line.slice(tabulation(line), line.length)
+          end
+        end
+
+        def tabulation(line)
+          spaces_count = 0
+          line.split("").each_with_index do |c, index|
+            if c != " "
+              spaces_count = index
+              break
+            end
+          end
+          spaces_count
+        end
+
+        def method_in_line?(line)
+          line.match /[ ]*(def).*/
+        end
+
+        def self_method_in_line?(line)
+          line.match /[ ]*(def)[ ]+self[.].*/
+        end
+
+        def private_in_line?(line)
+          !!line.match(/^[ ]*(private)[ ]*$/)
+        end
+
+        def protected_in_line?(line)
+          !!line.match(/^[ ]*(protected)[ ]*$/)
+        end
+
+        def public_in_line?(line)
+          !!line.match(/^[ ]*(public)[ ]*$/)
+        end
+      end
+    end
+  end
+end

data/lib/crystalize/version.rb

@@ -1,3 +1,3 @@
 module Crystalize
-  VERSION = "0.0.1"
+  VERSION = "0.0.7"
 end

data/todo.md

@@ -0,0 +1,14 @@
+# Todo
+
+## Checks
+- File should define only 1 class
+- Non basic classes are not passed into hash
+
+## Transforms
+- Transform all lambda calls from `[]` to `.call`
+- Automatic definition for `Anything` generic type based on class list
+- Ruby ternary to if
+- lonely operator `&.method` to `.try(&method)`
+- `class << self` to each `self.*` method
+- All `method(key: value)` to `method({key: value})`
+- Transform Hashes to Ruby compatible syntax

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: crystalize
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.7
 platform: ruby
 authors:
 - Oleg Orlov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby to Crystal converter
 email:
 - orelcokolov@gmail.com
@@ -65,6 +93,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -75,10 +104,23 @@ files:
 - bin/setup
 - crystalize-logo.png
 - crystalize.gemspec
+- hashes.rb
 - lib/crystalize.rb
-- lib/crystalize/converter.rb
-- lib/crystalize/literals.rb
+- lib/crystalize.rb.erb
+- lib/crystalize/check/lines/literals.rb
+- lib/crystalize/check/lines/meta.rb
+- lib/crystalize/code.rb
+- lib/crystalize/code_converter.rb
+- lib/crystalize/code_line.rb
+- lib/crystalize/options_validator.rb
+- lib/crystalize/project_converter.rb
+- lib/crystalize/ruby/ruby_core_extensions.rb
+- lib/crystalize/support.rb
+- lib/crystalize/transform/code/semicolons.rb
+- lib/crystalize/transform/lines/literals.rb
+- lib/crystalize/transform/lines/private_methods.rb
 - lib/crystalize/version.rb
+- todo.md
 homepage: https://github.com/OrelSokolov/crystalize
 licenses:
 - MIT
@@ -98,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby to Crystal converter

data/lib/crystalize/converter.rb

@@ -1,5 +0,0 @@
-module Crystalize
-  class Converter
-    include Crystalize::Literals
-  end
-end

data/lib/crystalize/literals.rb

@@ -1,11 +0,0 @@
-module Crystalize
-  module Literals
-    def array
-
-    end
-
-    def hashes
-
-    end
-  end
-end