go_script 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90683b2a65d61e15558743c1108ebbd66d4cf1b
-  data.tar.gz: ef2a0ce2405d4cb29093e2bbf0a76ce094943c15
+  metadata.gz: 7c361deaf94cf8438b4f9e1cc5385aa7ce62bac5
+  data.tar.gz: e8d6bfefa77c4b1a3079cde37023861b7058d065
 SHA512:
-  metadata.gz: 68002898685507d633ed2c979a0521ffabee6e4be7accd62c7ea61ca5cb21f7fae522f033413e4fb02245932d406c72095d72ebdae8f6ae0c8b3a728b5fec07b
-  data.tar.gz: 7cdb22cef865ef7e0e66992a952184021a617a65f11faa070c7874daf7a345ca22bc294c51579b1382983667a160469556ebaa08c80424c7401b02f3ad2e3d02
+  metadata.gz: 01eafdeee0fae80aadeb928d0b7b227163d014809a33e9307de6dd6d1e5bd06edd8945c3ca83b0eeb6115863a98de46049a52257ccec4b8ec2a7f037420151da
+  data.tar.gz: ff5dfb9e2fa1fdceee7ba38c2a8ea9c9e3fd5f773ed905a979828d3c5cb2b50706155c9c5cdb9c683d1b3135328f6cc6a335a830ad8919e78380bd938f87dd1c

data/README.md

@@ -1,4 +1,4 @@
-## The `./go` script: a unified development environment interface.
+## The `./go` script: a unified development environment interface
 
 A `./go` script aims to abstract away all of the steps needed to develop (and
 sometimes deploy) a software project. It is a replacement for READMEs and

data/bin/go-script-template

@@ -3,58 +3,6 @@
 
 require_relative '../lib/go_script'
 
-puts <<END_OF_TEMPLATE
-#! /usr/bin/env ruby
-
-require 'English'
-
-Dir.chdir File.dirname(__FILE__)
-
-def try_command_and_restart(command)
-  exit $CHILD_STATUS.exitstatus unless system command
-  exec({ 'RUBYOPT' => nil }, RbConfig.ruby, *[$PROGRAM_NAME].concat(ARGV))
-end
-
-begin
-  require 'bundler/setup' if File.exist? 'Gemfile'
-rescue LoadError
-  try_command_and_restart 'gem install bundler'
-rescue SystemExit
-  try_command_and_restart 'bundle install'
-end
-
-begin
-  require 'go_script'
-rescue LoadError
-  try_command_and_restart 'gem install go_script' unless File.exist? 'Gemfile'
-  abort "Please add \\\"gem 'go_script'\\\" to your Gemfile"
-end
-
-extend GoScript
-check_ruby_version '#{RUBY_VERSION}'
-
-command_group :dev, 'Development commands'
-
-def_command :init, 'Set up the development environment' do
-end
-
-def_command :update_gems, 'Update Ruby gems' do |gems|
-  update_gems gems
-end
-
-def_command :update_js, 'Update JavaScript components' do
-  update_node_modules
-end
-
-def_command :test, 'Execute automated tests' do |args|
-  exec_cmd "bundle exec rake test \#{args.join ' '}"
-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
-end
-
-execute_command ARGV
-END_OF_TEMPLATE
+puts GoScript::Template.preamble
+puts GoScript::Template.standard_dev_commands
+puts GoScript::Template.end

data/lib/go_script.rb

@@ -1,4 +1,5 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 require_relative './go_script/go'
+require_relative './go_script/template'
 require_relative './go_script/version'

data/lib/go_script/go.rb

@@ -44,7 +44,7 @@ module GoScript
       { 'RUBYOPT' => nil }, 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?)"
+      $stderr.puts '(Check syslog for possible `Out of memory` error?)'
       exit 1
     else
       exit $CHILD_STATUS.exitstatus unless status
@@ -64,8 +64,8 @@ module GoScript
     exec_cmd 'npm install'
   end
 
-  JEKYLL_BUILD_CMD = 'bundle exec jekyll build --trace'
-  JEKYLL_SERVE_CMD = 'bundle exec jekyll serve -w --trace'
+  JEKYLL_BUILD_CMD = 'jekyll build --trace'
+  JEKYLL_SERVE_CMD = 'jekyll serve -w --trace'
 
   def args_to_string(args)
     args ||= ''
@@ -90,10 +90,11 @@ module GoScript
   end
 
   def git_sync_and_deploy(commands, branch: nil)
-    exec_cmd 'git stash'
-    exec_cmd "git checkout -b #{branch}" unless branch.nil?
-    exec_cmd 'git pull'
-    exec_cmd 'bundle install' if File.exist? 'Gemfile'
+    exec_cmd 'git fetch origin #{branch}'
+    exec_cmd 'git clean -f'
+    exec_cmd "git reset --hard #{branch.nil? ? 'HEAD' : 'origin/' + branch}"
+    exec_cmd 'git submodule --sync --recursive'
+    exec_cmd 'git submodule update --init --recursive'
     commands.each { |command| exec_cmd command }
   end
 

data/lib/go_script/template.rb

@@ -0,0 +1,73 @@
+module GoScript
+  class Template
+    # rubocop:disable MethodLength
+    def self.preamble
+      <<END_OF_PREAMBLE
+#! /usr/bin/env ruby
+
+require 'English'
+
+Dir.chdir File.dirname(__FILE__)
+
+def try_command_and_restart(command)
+  exit $CHILD_STATUS.exitstatus unless system command
+  exec({ 'RUBYOPT' => nil }, RbConfig.ruby, *[$PROGRAM_NAME].concat(ARGV))
+end
+
+begin
+  require 'bundler/setup' if File.exist? 'Gemfile'
+rescue LoadError
+  try_command_and_restart 'gem install bundler'
+rescue SystemExit
+  try_command_and_restart 'bundle install'
+end
+
+begin
+  require 'go_script'
+rescue LoadError
+  try_command_and_restart 'gem install go_script' unless File.exist? 'Gemfile'
+  abort "Please add \\\"gem 'go_script'\\\" to your Gemfile"
+end
+
+extend GoScript
+check_ruby_version '#{RUBY_VERSION}'
+
+END_OF_PREAMBLE
+    end
+    # rubocop:enable MethodLength
+
+    # rubocop:disable MethodLength
+    def self.standard_dev_commands
+      <<END_STANDARD_DEV_COMMANDS
+command_group :dev, 'Development commands'
+
+def_command :init, 'Set up the development environment' do
+end
+
+def_command :update_gems, 'Update Ruby gems' do |gems|
+  update_gems gems
+end
+
+def_command :update_js, 'Update JavaScript components' do
+  update_node_modules
+end
+
+def_command :test, 'Execute automated tests' do |args|
+  exec_cmd "bundle exec rake test \#{args.join ' '}"
+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
+end
+
+END_STANDARD_DEV_COMMANDS
+    end
+    # rubocop:enable MethodLength
+
+    def self.end
+      "execute_command ARGV\n"
+    end
+  end
+end

data/lib/go_script/version.rb

@@ -1,7 +1,7 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 module GoScript
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 
   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.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  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:
@@ -124,6 +138,7 @@ files:
 - lib/go_script.rb
 - lib/go_script/command_group.rb
 - lib/go_script/go.rb
+- lib/go_script/template.rb
 - lib/go_script/version.rb
 homepage: https://github.com/18F/go_script
 licenses:
@@ -145,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: "./go script: a unified development environment interface"