prebundler 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b4617c0c426fe9ac76ca98f6d9a80e849a6f8fb848817f7bfa6a9c5393b238
-  data.tar.gz: be95fbc3f0f4f39682c2ee929d9a3c8ea27fd8db087f4a0d3d9c2c39f87c4b98
+  metadata.gz: 29f176a7f30feafc0288bcef4e1d519d364fe4b109a7dd2590b3c20a013908e2
+  data.tar.gz: dc8d72a575713cf2cb0e287af826a521a291c97266864c68e35da94c8c165d85
 SHA512:
-  metadata.gz: 244764066b66efdc4feb132dc3f94ed455cf141fdeb14b758d935e6dd1d8b960f3bdef4d2c783709a41fff7e30e6405e4871514d4220f757181af4e0951e72fe
-  data.tar.gz: 67d0a49d079f337e6522ed6765652f12e3fcd93546744f3ed0efae8e554e9f6604f8957118293c4d826985445048b7b65618cfbeb01a9af7b0a56b64a2cfa118
+  metadata.gz: 7cadcbdeef22c371ac69b91c069b5af37733804786f00562afcf5b38be73a016596e89b250b4f8ab06e7a3c8bdacac491aaeb3d4dce75554b377ce45cfa32f20
+  data.tar.gz: 351ac7ac53bbf7f60c3a98fa2b98aed366c1c02f6faf817f73511dae7420b232b130241830d183a31619b06e25b9087603befad9d44a70e4630c054632b84751

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.14.0
+* Add `prebundle binstubs` command, which simply invokes `bundle binstubs`.
+
 ## 0.13.0
 * Support the `eval_gemfile` function in gemfiles.
 * Avoid shelling out to the `tar` command.

data/bin/prebundle

@@ -1,130 +1,6 @@
 #! /usr/bin/env ruby
 
-require 'gli'
-require 'etc'
-require 'bundler'
-require 'prebundler'
-require 'prebundler/version'
-
-$out = Prebundler::WritePipe.new
-
-include GLI::App
-
-program_desc 'Gem dependency prebuilder'
-
-version Prebundler::VERSION
-
-subcommand_option_handling :normal
-arguments :strict
-
-desc "Don't log to stdout"
-switch [:s, :silent]
-
-desc 'Path to config file.'
-default_value './.prebundle_config'
-flag [:c, :config]
-
-desc 'Install gems from the Gemfile.lock.'
-command :install do |c|
-  c.desc 'Maximum number of parallel gem installs.'
-  c.default_value Etc.nprocessors
-  c.flag [:j, :jobs], type: Integer
-
-  c.desc 'Path to the gemfile to install gems from.'
-  c.default_value ENV.fetch('BUNDLE_GEMFILE', './Gemfile')
-  c.flag [:g, :gemfile]
-
-  c.desc 'Path to the bundle installation directory.'
-  c.default_value ENV.fetch('BUNDLE_PATH', Bundler.bundle_path.to_s)
-  c.flag [:b, :'bundle-path']
-
-  c.desc 'Backend prefix (i.e. path) at which to store gems.'
-  c.flag [:prefix]
-
-  c.desc 'A comma-separated list of groups referencing gems to install.'
-  c.flag :with
-
-  c.desc 'A comma-separated list of groups referencing gems to skip during installation.'
-  c.flag :without
-
-  c.desc 'Generate binstubs for installed gems.'
-  c.default_value true
-  c.switch :binstubs
-
-  c.desc 'Retry failed network requests n times (currently not implemented).'
-  c.default_value 1
-  c.flag [:retry], type: Integer
+$stdout.sync = true
 
-  c.action do |global_options, options, args|
-    raise 'Must specify a non-zero number of jobs' if options[:jobs] < 1
-    Prebundler::Cli::Install.run($out, global_options, options, args)
-  end
-end
-
-desc 'List each gem and associated source.'
-command :list do |c|
-  c.desc 'Path to the gemfile.'
-  c.default_value ENV.fetch('BUNDLE_GEMFILE', './Gemfile')
-  c.flag [:g, :gemfile]
-
-  c.desc 'Filter by source. Will perform partial matching.'
-  c.flag [:s, :source], multiple: true
-
-  c.action do |global_options, options, args|
-    Prebundler::Cli::List.run($out, global_options, options, args)
-  end
-end
-
-desc 'Generate a subset of a Gemfile.'
-command :subset do |c|
-  c.desc 'Path to the gemfile.'
-  c.default_value ENV.fetch('BUNDLE_GEMFILE', './Gemfile')
-  c.flag [:g, :gemfile]
-
-  c.desc 'Path to the bundle installation directory.'
-  c.default_value ENV.fetch('BUNDLE_PATH', Bundler.bundle_path.to_s)
-  c.flag [:b, :'bundle-path']
-
-  c.desc 'Gem (and dependencies) to include in the subset.'
-  c.flag [:i, :include], multiple: true
-
-  c.desc "Add an additional gem to the subset. The gem doesn't have to be part of the original Gemfile."
-  c.flag [:a, :add], multiple: true
-
-  c.desc 'Include development dependencies of subsetted gems.'
-  c.default_value false
-  c.switch [:d, :development]
-
-  c.desc 'File path to output the resulting Gemfile into. Use - for standard output.'
-  c.default_value '-'
-  c.flag [:o, :output]
-
-  c.action do |global_options, options, args|
-    Prebundler::Cli::Subset.run($out, global_options, options, args)
-  end
-end
-
-pre do |global, command, options, args|
-  # Pre logic here
-  # Return true to proceed; false to abort and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
-  $out.silence! if global[:silent]
-  load global[:config] if global[:config]
-  true
-end
-
-post do |global, command, options, args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  true
-end
-
-exit run(ARGV)
+require 'prebundler'
+exit Prebundler::Commands.run(ARGV)

data/lib/prebundler/commands.rb

@@ -0,0 +1,146 @@
+require 'gli'
+require 'etc'
+require 'bundler'
+require 'prebundler'
+require 'prebundler/version'
+
+module Prebundler
+  class Commands
+    extend GLI::App
+
+    program_desc 'Gem dependency prebuilder'
+
+    version Prebundler::VERSION
+
+    subcommand_option_handling :normal
+    arguments :strict
+
+    def self.out
+      @out ||= Prebundler::WritePipe.new
+    end
+
+    desc "Don't log to stdout"
+    switch [:s, :silent]
+
+    desc 'Path to config file.'
+    default_value './.prebundle_config'
+    flag [:c, :config]
+
+    desc 'Install gems from the Gemfile.lock.'
+    command :install do |c|
+      c.desc 'Maximum number of parallel gem installs.'
+      c.default_value Etc.nprocessors
+      c.flag [:j, :jobs], type: Integer
+
+      c.desc 'Path to the gemfile to install gems from.'
+      c.default_value ENV.fetch('BUNDLE_GEMFILE', './Gemfile')
+      c.flag [:g, :gemfile]
+
+      c.desc 'Path to the bundle installation directory.'
+      c.default_value ENV.fetch('BUNDLE_PATH', Bundler.bundle_path.to_s)
+      c.flag [:b, :'bundle-path']
+
+      c.desc 'Backend prefix (i.e. path) at which to store gems.'
+      c.flag [:prefix]
+
+      c.desc 'A comma-separated list of groups referencing gems to install.'
+      c.flag :with
+
+      c.desc 'A comma-separated list of groups referencing gems to skip during installation.'
+      c.flag :without
+
+      c.desc 'Generate binstubs for installed gems.'
+      c.default_value true
+      c.switch :binstubs
+
+      c.desc 'Retry failed network requests n times (currently not implemented).'
+      c.default_value 1
+      c.flag [:retry], type: Integer
+
+      c.action do |global_options, options, args|
+        raise 'Must specify a non-zero number of jobs' if options[:jobs] < 1
+        Prebundler::Cli::Install.run(out, global_options, options, args)
+      end
+    end
+
+    desc 'List each gem and associated source.'
+    command :list do |c|
+      c.desc 'Path to the gemfile.'
+      c.default_value ENV.fetch('BUNDLE_GEMFILE', './Gemfile')
+      c.flag [:g, :gemfile]
+
+      c.desc 'Filter by source. Will perform partial matching.'
+      c.flag [:s, :source], multiple: true
+
+      c.action do |global_options, options, args|
+        Prebundler::Cli::List.run(out, global_options, options, args)
+      end
+    end
+
+    desc 'Generate a subset of a Gemfile.'
+    command :subset do |c|
+      c.desc 'Path to the gemfile.'
+      c.default_value ENV.fetch('BUNDLE_GEMFILE', './Gemfile')
+      c.flag [:g, :gemfile]
+
+      c.desc 'Path to the bundle installation directory.'
+      c.default_value ENV.fetch('BUNDLE_PATH', Bundler.bundle_path.to_s)
+      c.flag [:b, :'bundle-path']
+
+      c.desc 'Gem (and dependencies) to include in the subset.'
+      c.flag [:i, :include], multiple: true
+
+      c.desc "Add an additional gem to the subset. The gem doesn't have to be part of the original Gemfile."
+      c.flag [:a, :add], multiple: true
+
+      c.desc 'Include development dependencies of subsetted gems.'
+      c.default_value false
+      c.switch [:d, :development]
+
+      c.desc 'File path to output the resulting Gemfile into. Use - for standard output.'
+      c.default_value '-'
+      c.flag [:o, :output]
+
+      c.action do |global_options, options, args|
+        Prebundler::Cli::Subset.run(out, global_options, options, args)
+      end
+    end
+
+    desc 'Generate binstubs. Accepts the same arguments as `bundle binstubs`.'
+    command :binstubs do
+    end
+
+    singleton_class.send(:prepend, Module.new do
+      def run(args)
+        if args[0] == 'binstubs'
+          exec "bundle binstubs #{args[1..-1].join(' ')}"
+        else
+          super
+        end
+      end
+    end)
+
+    pre do |global, command, options, args|
+      # Pre logic here
+      # Return true to proceed; false to abort and not call the
+      # chosen command
+      # Use skips_pre before a command to skip this block
+      # on that command only
+      out.silence! if global[:silent]
+      load global[:config] if global[:config]
+      true
+    end
+
+    post do |global, command, options, args|
+      # Post logic here
+      # Use skips_post before a command to skip this
+      # block on that command only
+    end
+
+    on_error do |exception|
+      # Error logic here
+      # return false to skip default error handling
+      true
+    end
+  end
+end

data/lib/prebundler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prebundler
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/lib/prebundler.rb

@@ -2,6 +2,7 @@ require 'ohey'
 
 module Prebundler
   autoload :Cli,                'prebundler/cli'
+  autoload :Commands,           'prebundler/commands'
   autoload :Configurator,       'prebundler/configurator'
   autoload :FileBackend,        'prebundler/file_backend'
   autoload :PathGemRef,         'prebundler/path_gem_ref'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Cameron Dutro
@@ -99,6 +99,7 @@ files:
 - lib/prebundler/cli/install.rb
 - lib/prebundler/cli/list.rb
 - lib/prebundler/cli/subset.rb
+- lib/prebundler/commands.rb
 - lib/prebundler/configurator.rb
 - lib/prebundler/file_backend.rb
 - lib/prebundler/gem_ref.rb