go_script 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c361deaf94cf8438b4f9e1cc5385aa7ce62bac5
-  data.tar.gz: e8d6bfefa77c4b1a3079cde37023861b7058d065
+  metadata.gz: 18b0d506e2ad5b11139f95c535b36c8ed1850fa0
+  data.tar.gz: 83a989383def34f255f8ee3561f38bf7786401d0
 SHA512:
-  metadata.gz: 01eafdeee0fae80aadeb928d0b7b227163d014809a33e9307de6dd6d1e5bd06edd8945c3ca83b0eeb6115863a98de46049a52257ccec4b8ec2a7f037420151da
-  data.tar.gz: ff5dfb9e2fa1fdceee7ba38c2a8ea9c9e3fd5f773ed905a979828d3c5cb2b50706155c9c5cdb9c683d1b3135328f6cc6a335a830ad8919e78380bd938f87dd1c
+  metadata.gz: 87bd1fb4fc214ec4ea9d4633b3a426d855760e6ee5d55928ca7c6b4ba8b21c72e864d325dbdd608136f1ba08d5b60f605e17ebfe93c5e68de92def202358d134
+  data.tar.gz: 428815e269a17b160a839f48d70e6d681508ac0246c87252f2b57a31c1fb0a6cfb4340a24c626e19e604c4a6f823e3f659ced64c449c2a1207d22e0db15ccdb0

data/lib/go_script/go.rb

@@ -40,8 +40,7 @@ module GoScript
   end
 
   def exec_cmd(cmd)
-    status = system(
-      { 'RUBYOPT' => nil }, cmd, err: :out)
+    status = system(cmd, err: :out)
     if $CHILD_STATUS.exitstatus.nil?
       $stderr.puts "could not run command: #{cmd}"
       $stderr.puts '(Check syslog for possible `Out of memory` error?)'
@@ -99,11 +98,11 @@ module GoScript
   end
 
   def lint_ruby(files)
-    exec_cmd "bundle exec rubocop #{file_args_by_extension files, '.rb'}"
+    exec_cmd "rubocop #{file_args_by_extension files, '.rb'}"
   end
 
   def lint_javascript(basedir, files)
     files = file_args_by_extension files, '.js'
-    exec_cmd "#{basedir}/node_modules/jshint/bin/jshint #{files}"
+    exec_cmd "#{basedir}/node_modules/.bin/eslint #{files}"
   end
 end

data/lib/go_script/template.rb

@@ -1,17 +1,37 @@
+require_relative './version'
+
 module GoScript
   class Template
     # rubocop:disable MethodLength
     def self.preamble
       <<END_OF_PREAMBLE
 #! /usr/bin/env ruby
+#
+# The preamble down to the check_ruby_version line was generated by version
+# #{VERSION} of the go_script gem. This preamble tries to load bundler state
+# from Gemfile.lock if present, then the go_script gem for core functionality.
+#
+# This means the ./go script will run `gem install` or `bundle install` as
+# necessary when invoked for the first time, or when dependencies change. It
+# also means that commands invoked within the ./go script do not need to be
+# prefixed with `bundle exec`.
 
 require 'English'
 
 Dir.chdir File.dirname(__FILE__)
 
+# If a require statement fails, the script calls try_command_and_restart to
+# try to install the necessary gems before re-executing itself with the
+# original arguments.
 def try_command_and_restart(command)
   exit $CHILD_STATUS.exitstatus unless system command
-  exec({ 'RUBYOPT' => nil }, RbConfig.ruby, *[$PROGRAM_NAME].concat(ARGV))
+
+  # If the RUBYOPT environment variable is set, bundler will presume that it
+  # has already run. Hence, filtering out RUBYOPT forces bundler to load its
+  # state during the re-execution.
+  env = {}.merge(ENV)
+  env.delete('RUBYOPT')
+  exec(env, RbConfig.ruby, *[$PROGRAM_NAME].concat(ARGV))
 end
 
 begin
@@ -53,13 +73,12 @@ def_command :update_js, 'Update JavaScript components' do
 end
 
 def_command :test, 'Execute automated tests' do |args|
-  exec_cmd "bundle exec rake test \#{args.join ' '}"
+  exec_cmd "rake test \#{args_to_string args}"
 end
 
 def_command :lint, 'Run style-checking tools' do |files|
-  files = files.group_by { |f| File.extname f }
-  lint_ruby files['.rb']  # uses rubocop
-  lint_javascript Dir.pwd, files['.js']  # uses node_modules/jshint
+  lint_ruby files  # uses rubocop
+  lint_javascript Dir.pwd, files  # uses node_modules/eslint
 end
 
 END_STANDARD_DEV_COMMANDS

data/lib/go_script/version.rb

@@ -1,7 +1,7 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 module GoScript
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 
   class Version
     def self.check_ruby_version(min_version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go_script
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guides_style_18f
+  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: Abstracts common functionality used in the `./go` scripts of several
   18F projects, and provides a `./go` script generator for new projects.
 email: