rusby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220468d5f249c9e28f702ff82cc05857fec824a3
-  data.tar.gz: ac156b073759a711c1889f0d4cdb39fedc823ff7
+  metadata.gz: c3194c9f2b246c00288fbe537b79ebf90484ace2
+  data.tar.gz: 7725bf97b5b7612fab8bce40108dbf415ca85054
 SHA512:
-  metadata.gz: addbb61765e9957e47af6b79f28cbc17597144997e667728f71628d93a80c231e8e3ba0efc1b7806f851c194ab5560540c8de0dba746ad17ae8e4d1ee38e2ae2
-  data.tar.gz: 80795fd42665c369763f4d72ecba264a977ecd3c5cc808e08dc6aef13886770e597f93cbfebc1aaa6fee55a47ee359c7da59c5e7e166d7b412044867923b000e
+  metadata.gz: 5b89750908323e010f5cabd541cc45390de0ed67ec6f5ca2d18d9f65928b713305bb2055242133384b280a7abc96fed352701814893e0597e8e7ba4696f6c6a5
+  data.tar.gz: bb5dd9f51c4578aa8a7ad22b64368ce3fdf9d01a7ed1b966f495f335bbd3da6384b0d7b06612352bc5f595141094c4116826fd365ba73a962bd801a7028425fa

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
+  - 1.9.3
   - 2.2.2
-before_install: gem install bundler -v 1.12.4
+before_install:
+  - gem install bundler -v 1.12.4

data/README.md

@@ -1,5 +1,7 @@
 ## About
 
+[![Build Status](https://travis-ci.org/rambler-digital-solutions/rusby.svg?branch=master)](https://travis-ci.org/rambler-digital-solutions/rusby)
+
 **Rusby** is a *Ruby* to *Rust* transpiler for simple performance-oriented methods.
 
 Computations in plain Ruby are painfully slow.
@@ -42,21 +44,49 @@ Transpilation was tested only on cases in `./examples` directory.
 - Integer matrix manipulation support
 
 ## Quickstart
-```
-brew install rust # or similar
-cd examples
+```shell
+curl -sSf https://static.rust-lang.org/rustup.sh | sh # or install rust via your package manager
+git clone https://github.com/rambler-digital-solutions/rusby
+cd rusby/examples
 bundle
 ruby run_examples.rb
 ```
 
-## Tests
+or
+
+```shell
+gem install rusby
 ```
+
+Create file test.rb:
+```ruby
+require 'rusby'
+
+class FanaticGreeter
+  extend Rusby::Core
+
+  rusby!
+  def greet(name)
+    "Hello, #{name}!"
+  end
+end
+
+greeter = FanaticGreeter.new
+2.times { greeter.greet('Ash') }
+```
+
+```shell
+ruby test.rb
+```
+
+## Tests
+```shell
 rake spec
 ```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rusby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/rambler-digital-solutions/rusby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/rusby.rb

@@ -1,12 +1,10 @@
-require 'parser/ruby22'
-require 'yaml'
-require 'hashie'
-require 'method_source'
-require 'colorize'
 require 'benchmark'
+require 'colorize'
 require 'ffi'
-
-require "rusby/version"
+require 'hashie'
+require 'method_source'
+require 'parser/current'
+require 'yaml'
 
 rusby_dir = File.expand_path('../rusby', __FILE__)
 Dir["#{rusby_dir}/**/*.rb"].each { |file| require file }

data/lib/rusby/builder.rb

@@ -9,8 +9,8 @@ module Rusby
     def lib_path
       return @lib_path if @lib_path
       path = './tmp/rusby'
-      Dir.mkdir('./tmp') unless Dir.exists?('./tmp')
-      Dir.mkdir(path) unless Dir.exists?(path)
+      Dir.mkdir('./tmp') unless Dir.exist?('./tmp')
+      Dir.mkdir(path) unless Dir.exist?(path)
       @lib_path = path
     end
 
@@ -48,8 +48,13 @@ module Rusby
         meta[method_name][:args],
         meta[method_name][:result]
       )
-      puts "Compiling #{signature.last} #{method_name}(#{signature.first.join(', ')})".colorize(:yellow)
-      puts `rustc -A unused_imports --crate-type=dylib -O -o #{lib_path}/#{method_name}.dylib #{lib_path}/#{method_name}.rs`
+      puts "Compiling #{signature.last} #{method_name}" \
+        "(#{signature.first.join(', ')})".colorize(:yellow)
+      command = 'rustc -A unused_imports --crate-type=dylib '
+      command += "-O -o #{lib_path}/#{method_name}.dylib "
+      command += "#{lib_path}/#{method_name}.rs"
+      puts `#{command}`
+
 
       Proxy.rusby_load "#{lib_path}/#{method_name}"
       Proxy.attach_function "ffi_#{method_name}", *signature
@@ -97,12 +102,17 @@ module Rusby
         '',
         '// this function folds ffi arguments and unfolds result to ffi types'
       ]
-      result << "#{rust.exposed_method_prefix} fn ffi_#{method_name}(#{args.join(', ')}) -> #{rust.rust_to_ffi_types[return_type] || rust.rust_types[return_type]} {"
+      result << "#{rust.exposed_method_prefix} fn " \
+        "ffi_#{method_name}(#{args.join(', ')}) -> " \
+        "#{rust.rust_to_ffi_types[return_type] || rust.rust_types[return_type]}" \
+        ' {'
       arg_names.each_with_index.map do |arg_name, i|
-        next unless rust.ffi_to_rust[arg_types[i]] # for simple args we don't need any convertion
+        # for simple args we don't need any convertion
+        next unless rust.ffi_to_rust[arg_types[i]]
         result << rust.ffi_to_rust[arg_types[i]].gsub('<name>', arg_name).to_s
       end
-      result << "let result = #{method_name}(#{arg_names.join(', ')});" # calls the real method with ffi args folded
+      # calls the real method with ffi args folded
+      result << "let result = #{method_name}(#{arg_names.join(', ')});"
       result << "return #{rust.rust_to_ffi[return_type] || 'result'};"
       result << '}'
 
@@ -113,17 +123,24 @@ module Rusby
       arg_types = meta[:args]
       return_type = meta[:result]
 
-      ast = Parser::Ruby22.parse(source)
+      ast = Parser::CurrentRuby.parse(source)
       method_name = ast.children[0]
       arg_names = ast.children[1].children.map { |ch| ch.children[0].to_s }
       meta[:names] = arg_names
 
-      result = exposed ? ffi_wrapper(method_name, arg_names, arg_types, return_type) : []
+      result = []
+      if exposed
+        result = ffi_wrapper(method_name, arg_names, arg_types, return_type)
+      end
       result << rust.method_prefix
 
-      args = arg_names.each_with_index.map { |arg_name, i| "#{arg_name}: #{rust.rust_types[arg_types[i]]}" }
+      args = arg_names.each_with_index.map do |arg_name, i|
+        "#{arg_name}: #{rust.rust_types[arg_types[i]]}"
+      end
 
-      result << "fn #{exposed ? '' : 'internal_method_'}#{method_name}(#{args.join(', ')}) -> #{rust.rust_types[return_type]} {"
+      result << "fn #{exposed ? '' : 'internal_method_'}" \
+        "#{method_name}(#{args.join(', ')}) -> " \
+        "#{rust.rust_types[return_type]} {"
       result << rust_method_body(meta, ast)
       result << '}'
 

data/lib/rusby/core.rb

@@ -21,14 +21,17 @@ module Rusby
       bound_method = method_reference.bind(object)
       result = bound_method.call(*args)
 
-      @rusby_method_table[method_name][:args] = args.map { |arg| rusby_type(arg) }
+      @rusby_method_table[method_name][:args] = args.map do |arg|
+        rusby_type(arg)
+      end
       @rusby_method_table[method_name][:result] = rusby_type(result)
 
       if @rusby_method_table[method_name][:exposed]
         # try to convert to rust or return back the original method
         rusby_convert_or_bust(method_name, method_reference, object, args)
       else
-        # if we don't need to convert method to rust return back the original method
+        # if we don't need to convert method to
+        # rust return back the original method
         rusby_replace_method(method_name, method_reference)
       end
 
@@ -63,8 +66,14 @@ module Rusby
       end
 
       # check if rust method is running faster than the original one
-      puts 'Benchmarking native and rust methods (intertwined pattern)'.colorize(:yellow)
-      boost = Profiler.benchit(object, method_reference, wrapped_rust_method, args)
+      puts "Benchmarking native and rust methods" \
+        " (intertwined pattern)".colorize(:yellow)
+      boost = Profiler.benchit(
+        object,
+        method_reference,
+        wrapped_rust_method,
+        args
+      )
 
       # coose between rust and ruby methods
       resulting_method = method_reference

data/lib/rusby/generators/assignments.rb

@@ -33,7 +33,8 @@ module Rusby
       end
 
       def generate_op_asgn(ast)
-        "#{generate(ast.children[0])} #{ast.children[1]}= #{generate(ast.children[2])}"
+        "#{generate(ast.children[0])} #{ast.children[1]}=" \
+          " #{generate(ast.children[2])}"
       end
     end
   end

data/lib/rusby/generators/base.rb

@@ -2,21 +2,22 @@ module Rusby
   module Generators
     module Base
       def generate(ast)
-        unless ast.respond_to?(:type)
+        if ast.respond_to?(:type)
+          send("generate_#{ast.type.to_s.tr('-', '_')}", ast)
+        else
           # ok, it's not ast node, but it could be a method
           # redefine internal ruby methods as needed
-          return case ast
-                 when :<< || :>>
-                   ast
-                 when :length
-                   '.len()'
-                 when :min
-                   '.iter().min()'
-                 else
-                   ast.to_s
-                end
+          case ast
+          when :<< || :>>
+            ast
+          when :length
+            '.len()'
+          when :min
+            '.iter().min()'
+          else
+            ast.to_s
+          end
         end
-        send("generate_#{ast.type.to_s.tr('-', '_')}", ast)
       end
 
       def generate_send(ast)
@@ -26,7 +27,8 @@ module Rusby
           verb = ast.children[1]
           case verb
           when :puts
-            "\nprintln!(\"{}\", #{generate(ast.children[2])});io::stdout().flush().unwrap();\n"
+            "\nprintln!(\"{}\", #{generate(ast.children[2])});" \
+              "io::stdout().flush().unwrap();\n"
           # argument of this ruby method is rust code "as is"
           when :rust
             ast.children[2].children[0] + ' // generated by Rusby::Preprocessor'
@@ -39,7 +41,9 @@ module Rusby
 
             arguments = fold_arrays(ast.children[2..-1])
             result = "#{verb}(#{arguments.join(', ')});"
-            result = 'internal_method_' + result unless known_method?(ast.children[1])
+            unless known_method?(ast.children[1])
+              result = 'internal_method_' + result
+            end
             result
           end
         end

data/lib/rusby/generators/conditionals.rb

@@ -2,16 +2,15 @@ module Rusby
   module Generators
     module Conditionals
       def generate_if(ast)
-        result = if ast.children[1]
-                   generate_regular_if(ast)
-                 else
-                   generate_unless(ast)
-        end
-        result.gsub(/^\s+/, '')
+        if ast.children[1]
+          generate_regular_if(ast)
+        else
+          generate_unless(ast)
+        end.gsub(/^\s+/, '')
       end
 
       def generate_unless(ast)
-        result = <<-EOF
+        <<-EOF
           if !(#{generate(ast.children[0])}) {
             #{generate(ast.children[2])}
           }

data/lib/rusby/generators/loops.rb

@@ -36,18 +36,22 @@ module Rusby
       def generate_each_loop_range(ast)
         range = ast.children[0].children[0].children[0]
         range_start = range.children[0].children[0]
-        range_end = "(#{range.children[1].children[0]} + 1)" # rust range is inclusive
+        # rust range is inclusive
+        range_end = "(#{range.children[1].children[0]} + 1)"
         range_variable = ast.children[1].children[0].children[0]
         statements = ast.children[1..-1].map { |node| generate(node) }.compact
-        "for #{range_variable} in #{range_start}..#{range_end} {\n#{statements.join("\n")}\n}"
+        "for #{range_variable} in #{range_start}..#{range_end}" \
+          " {\n#{statements.join("\n")}\n}"
       end
 
       def generate_while(ast)
-        "while #{generate(ast.children[0])} {\n#{generate(ast.children[1])}\n}"
+        "while #{generate(ast.children[0])}" \
+          " {\n#{generate(ast.children[1])}\n}"
       end
 
       def generate_while_post(ast)
-        "while {\n#{generate(ast.children[1])};\n#{generate(ast.children[0])}\n}{}"
+        "while {\n#{generate(ast.children[1])};\n" \
+          "#{generate(ast.children[0])}\n}{}"
       end
     end
   end

data/lib/rusby/generators/misc.rb

@@ -14,7 +14,8 @@ module Rusby
 
       def generate_return(ast)
         statements = ast.children.map { |node| generate(node) }
-        "return #{statements.any? ? statements.join(',') : '&-ptr'} as #{@return_type};"
+        "return #{statements.any? ? statements.join(',') : '&-ptr'}" \
+          " as #{@return_type};"
       end
 
       def generate_kwbegin(ast)

data/lib/rusby/generators/strings.rb

@@ -3,7 +3,9 @@ module Rusby
     module Strings
       # string interpolation
       def generate_dstr(ast)
-        ast.children.map { |node| "(#{generate(node)}).to_string()" }.join(' + &')
+        ast.children.map do |node|
+          "(#{generate(node)}).to_string()"
+        end.join(' + &')
       end
     end
   end

data/lib/rusby/postprocessor.rb

@@ -5,10 +5,12 @@ module Rusby
     def apply(code, meta)
       # fold the array syntax
       meta[:args].each_with_index do |el, idx|
-        if el == 'String'
-          code.gsub!(/#{meta[:names][idx]}\[(.+?)\]/, "#{meta[:names][idx]}.chars().nth(\\1)")
-          code.gsub!(/;+/, ';')
-        end
+        next unless el == 'String'
+        code.gsub!(
+          /#{meta[:names][idx]}\[(.+?)\]/,
+          "#{meta[:names][idx]}.chars().nth(\\1)"
+        )
+        code.gsub!(/;+/, ';')
       end
       # process array :<< and :>> operator
       code.gsub!(/(?:<<|>>)(\S+)/, '.push(\1);')

data/lib/rusby/profiler.rb

@@ -24,7 +24,8 @@ module Rusby
 
       boost = m1 > m2 ? m1 / m2 : - m2 / m1
 
-      printf "\r=> got #{'%.2fx boost'.colorize(boost > 0 ? :green : :red)} (%.2fs original vs %.2fs rust) %s\n\n", boost, m1, m2, ' ' * 80
+      printf "\r=> got #{'%.2fx boost'.colorize(boost > 0 ? :green : :red)}" \
+        " (%.2fs original vs %.2fs rust) %s\n\n", boost, m1, m2, ' ' * 80
 
       boost
     end

data/lib/rusby/rust.rb

@@ -60,7 +60,8 @@ module Rusby
     end
 
     def method_missing(method_name, *args)
-      puts "No method for '#{method_name.to_s.sub('generate_', '')}' AST node.".colorize(:red)
+      puts "No method for '#{method_name.to_s.sub('generate_', '')}'" \
+        ' AST node.'.colorize(:red)
       puts "Please implement #{method_name} in Rusby::Rust.".colorize(:yellow)
       puts "Arguments: #{args.inspect}".colorize(:yellow)
       raise RuntimeError

data/lib/rusby/version.rb

@@ -1,3 +1,3 @@
 module Rusby
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'.freeze
 end

data/rusby.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rusby'
+require 'rusby/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rusby"
@@ -16,17 +16,18 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "byebug"
 
   spec.add_runtime_dependency 'method_source'
   spec.add_runtime_dependency 'ffi'
   spec.add_runtime_dependency 'hashie'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'parser'
-  spec.add_runtime_dependency 'ruby-prof'
+
+  spec.require_paths = [
+    "lib"
+  ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rusby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexander Krasnoschekov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  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'
 description: 
 email:
 - akrasnoschekov@gmail.com
@@ -161,7 +133,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -170,7 +141,6 @@ files:
 - doc/img1.png
 - doc/slides.key
 - examples/Gemfile
-- examples/Gemfile.lock
 - examples/fanatic_greeter.rb
 - examples/fanatic_pluser.rb
 - examples/levenshtein_distance.rb
@@ -216,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby to Rust transpiler for simple performance-oriented methods.

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rusby (0.1.0)
-      colorize
-      ffi
-      hashie
-      method_source
-      parser
-      ruby-prof
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.2.0)
-    byebug (9.0.5)
-    colorize (0.7.7)
-    diff-lcs (1.2.5)
-    ffi (1.9.10)
-    hashie (3.4.4)
-    method_source (0.8.2)
-    parser (2.3.1.0)
-      ast (~> 2.2)
-    rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby-prof (0.15.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.12)
-  byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rusby!
-
-BUNDLED WITH
-   1.12.4

data/examples/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rusby (0.1.0)
-      colorize
-      ffi
-      hashie
-      method_source
-      parser
-      ruby-prof
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.2.0)
-    colorize (0.7.7)
-    ffi (1.9.10)
-    hashie (3.4.4)
-    method_source (0.8.2)
-    parser (2.3.1.0)
-      ast (~> 2.2)
-    ruby-prof (0.15.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rusby!
-
-BUNDLED WITH
-   1.12.4