[Fix] no spaces in files bug, remove deprecated code, demonstrate rubocop, remove host

Author: graham jenson

.gitignore

@@ -1,2 +1,4 @@
 **/bazel-*
 **/.idea
+
+.DS_Store

examples/simple_script/BUILD

@@ -30,3 +30,15 @@ ruby_test(
         "@bundle//:rspec",
     ],
 )
+
+# TODO: not the best way of defining this, should make `rubocop` rule like `buildifier`
+ruby_binary(
+    name = "rubocop",
+    srcs = [
+        "@bundle//:bin/rubocop",
+    ],
+    main = "@bundle//:bin/rubocop",
+    deps = [
+        "@bundle//:rubocop",
+    ],
+)

examples/simple_script/Gemfile

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
 
+gem 'awesome_print'
 gem 'rspec', '~> 3.7.0'
-gem 'awesome_print'
+gem 'rubocop'

examples/simple_script/Gemfile.lock

@@ -1,8 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     awesome_print (1.8.0)
     diff-lcs (1.3)
+    jaro_winkler (1.5.4)
+    parallel (1.19.1)
+    parser (2.6.5.0)
+      ast (~> 2.4.0)
+    rainbow (3.0.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -16,13 +22,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    rubocop (0.77.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   awesome_print
   rspec (~> 3.7.0)
+  rubocop
 
 BUNDLED WITH
    1.17.3

examples/simple_script/README.md

@@ -1,3 +1,19 @@
 # Simple Script Example
 
-This Workspace includes a simple ruby script that includes and external gem and an internal library
+This Workspace includes a simple ruby script that includes and external gem and an internal library
+
+
+### Bundle
+
+Update gemfile using
+
+```
+bundle lock --update
+```
+
+### Rubocop
+Run rubocop with:
+
+```
+bazel run :rubocop -- $(pwd)/* -a
+```

examples/simple_script/WORKSPACE

@@ -25,6 +25,9 @@ load("@bazelruby_ruby_rules//ruby:defs.bzl", "bundle_install")
 
 bundle_install(
     name = "bundle",
+    excludes = {
+        "mini_portile": ["test/**/*"],
+    },
     gemfile = "//:Gemfile",
     gemfile_lock = "//:Gemfile.lock",
     version = "2.0.2",

examples/simple_script/script.rb

@@ -2,14 +2,14 @@
 
 require 'openssl'
 require 'lib/foo'
-require "awesome_print"
+require 'awesome_print'
 
 def oss_rand
   OpenSSL::BN.rand(512).to_s
 end
 
-puts Foo.aha + " " + oss_rand
+puts Foo.aha + ' ' + oss_rand
 
 puts $LOAD_PATH
 
-ap Class
+ap Class

ruby/private/binary.bzl

@@ -29,50 +29,26 @@ def _ruby_binary_impl(ctx):
             "main",
         )
 
-    if sdk.is_host:
-        interpreter_file_deps = []
-        interpreter_trans_deps = []
-    else:
-        interpreter_file_deps = [interpreter]
-        interpreter_trans_deps = [sdk.interpreter]
-
     executable = ctx.actions.declare_file(ctx.attr.name)
     deps = _transitive_deps(
         ctx,
-        extra_files = interpreter_file_deps + [executable],
-        extra_deps = interpreter_trans_deps + ctx.attr._misc_deps,
+        extra_files = [executable],
+        extra_deps = ctx.attr._misc_deps,
     )
 
     rubyopt = reversed(deps.rubyopt.to_list())
-    intermediate_executable = ctx.actions.declare_file("%s.tpl.intermediate" % ctx.attr.name)
+
     ctx.actions.expand_template(
         template = ctx.file._wrapper_template,
-        output = intermediate_executable,
+        output = executable,
         substitutions = {
             "{loadpaths}": repr(deps.incpaths.to_list()),
             "{rubyopt}": repr(rubyopt),
             "{main}": repr(_to_manifest_path(ctx, main)),
             "{interpreter}": _to_manifest_path(ctx, interpreter),
         },
     )
-    if sdk.is_host:
-        ctx.actions.run_shell(
-            inputs = [intermediate_executable],
-            outputs = [executable],
-            command = "grep -v '^#shell ' %s > %s" % (
-                intermediate_executable.path,
-                executable.path,
-            ),
-        )
-    else:
-        ctx.actions.run_shell(
-            inputs = [intermediate_executable],
-            outputs = [executable],
-            command = "sed 's/^#shell //' %s > %s" % (
-                intermediate_executable.path,
-                executable.path,
-            ),
-        )
+
     return [DefaultInfo(
         executable = executable,
         default_runfiles = deps.default_files,

ruby/private/binary_wrapper.tpl

@@ -1,8 +1,3 @@
-#shell #!/usr/bin/env bash
-#shell # This conditional is evaluated as true in Ruby, false in shell
-#shell if [ ]; then
-#shell eval <<'END_OF_RUBY'
-#shell # -- begin Ruby --
 #!/usr/bin/env ruby
 
 # Ruby-port of the Bazel's wrapper script for Python
@@ -24,6 +19,7 @@
 #
 
 require 'rbconfig'
+require 'rubygems'
 
 def find_runfiles
   stub_filename = File.absolute_path($0)
@@ -122,28 +118,10 @@ def main(args)
       end
     end
   end
-  exec(ruby_program, '--disable-gems', *rubyopt, main, *args)
+  exec(ruby_program, *rubyopt, main, *args)
   # TODO(yugui) Support windows
 end
 
 if __FILE__ == $0
   main(ARGV)
 end
-#shell END_OF_RUBY
-#shell __END__
-#shell # -- end Ruby --
-#shell fi
-#shell # -- begin Shell Script --
-#shell 
-#shell # --- begin runfiles.bash initialization v2 ---
-#shell # Copy-pasted from the Bazel Bash runfiles library v2.
-#shell set -uo pipefail; f=bazel_tools/tools/bash/runfiles/runfiles.bash
-#shell source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
-#shell source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
-#shell source "$0.runfiles/$f" 2>/dev/null || \
-#shell source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
-#shell source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
-#shell { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
-#shell # --- end runfiles.bash initialization v2 ---
-#shell 
-#shell exec "$(rlocation {interpreter})" ${BASH_SOURCE:-$0} "$@"

ruby/private/bundle/bundle.bzl

@@ -56,12 +56,6 @@ def bundle_install_impl(ctx):
     if result.return_code:
         fail("Failed to install gems: %s%s" % (result.stdout, result.stderr))
 
-    # exclude any specified files
-    exclude = []
-    for gem, globs in ctx.attr.excludes.items():
-        expanded = ["lib/ruby/*/gems/%s-*/%s" % (gem, glob) for glob in globs]
-        exclude.extend(expanded)
-
     # Create the BUILD file to expose the gems to the WORKSPACE
     args = [
         "env",
@@ -74,7 +68,7 @@ def bundle_install_impl(ctx):
         "BUILD.bazel",  # Bazel build file (can be empty)
         "Gemfile.lock",  # Gemfile.lock where we list all direct and transitive dependencies
         ctx.name,  # Name of the target
-        repr(exclude),
+        repr(ctx.attr.excludes),
         RULES_RUBY_WORKSPACE_NAME,
     ]
     result = ctx.execute(args, quiet = False)
@@ -87,7 +81,6 @@ def bundle_install_impl(ctx):
             ctx.attr._buildfile_template,
             substitutions = {
                 "{repo_name}": ctx.name,
-                "{exclude}": repr(exclude),
                 "{workspace_name}": RULES_RUBY_WORKSPACE_NAME,
             },
         )