gemx 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcfb924881fd236592853cd2e23cd191b5bacfd639d95edd1ee05128d8a5e6eb
-  data.tar.gz: b0d4b606b96ed30e36db5c6377ef63d0452691a0c3f9c3ed2f905525fcc11c7d
+  metadata.gz: cbc55303df14243474da3f5eefcfc219e5dffe15c7e6f1db67d20f839b9e1082
+  data.tar.gz: 3db245cc4fc12d4e9d5459c6a588d21caa946cb78a374a6ac6fee2328ed52d64
 SHA512:
-  metadata.gz: d23882aef1d64ee8f1013f3f45ae26ba73092c94cfc52795cacd5812ccea76e13e7c58e6a124677c85148c06e3817c08b0e30022569875d94ae076910c061713
-  data.tar.gz: 67dd0e4ce8e97910f2e775bd90dde474fd79c14e968762c98ef3526288d285642377e2a42ea75303fcff24a25274a06913b7681e6ede59b6742a94468456ca0a
+  metadata.gz: 1c2839f4f755f927448056c687275fed3f80c15011ae7e9855d85c7fb0bb570b3e894b5be6428660b2ae798d0d90a387f1131dfedd05f3bb44762d01ffd7e4cb
+  data.tar.gz: ea6df1cbee98d7eef90d307823d82d8dbc14c44a8d37d1df85d8d6ce5db2bc8cdb3d609d88e263637c72f189f4705a112ba04afdd04c4e3794369c068045bd66

data/.rubocop.yml

@@ -1 +1,7 @@
 inherit_from: .rubocop_todo.yml
+
+Metrics:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,16 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-12-01 15:42:22 -0600 using RuboCop version 0.49.1.
+# on 2018-04-10 20:20:02 -0700 using RuboCop version 0.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-Metrics/AbcSize:
-  Max: 38
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 25

data/VERSION

@@ -0,0 +1 @@
+0.2.0

data/bin/gemx

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+load File.expand_path('../../exe/gemx', __FILE__)

data/gemx.gemspec

@@ -1,10 +1,7 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gemx/version'
-
 Gem::Specification.new do |spec|
   spec.name          = 'gemx'
-  spec.version       = GemX::VERSION
+  spec.version       = File.read(File.expand_path('../VERSION', __FILE__))
+                           .strip.freeze
   spec.authors       = ['Samuel Giddins']
   spec.email         = ['segiddins@segiddins.me']
 

data/lib/gemx.rb

@@ -5,7 +5,15 @@ require 'rubygems'
 
 # Execute a command that comes from a gem
 module GemX
-  X = Struct.new(:verbose, :gem_name, :requirements, :executable, :arguments)
+  X = Struct.new(
+    :gem_name,
+    :requirements,
+    :executable,
+    :arguments,
+    :conservative,
+    :verbose
+  )
+
   # The eXecutable part of this gem
   class X
     def install_if_needed
@@ -71,7 +79,7 @@ module GemX
         opts.version = VERSION
         opts.banner = 'Usage: gemx [options --] command'
 
-        opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
+        opts.on_tail('-v', '--[no-]verbose', 'Run verbosely') do |v|
           options.verbose = v
         end
 
@@ -84,20 +92,53 @@ module GemX
                 'Run the gem with the given requirement') do |r|
           options.requirements.concat [r]
         end
+
+        opts.on('--pre',
+                'Allow resolving pre-release versions of the gem') do |_r|
+          options.requirements.concat ['>= 0.a']
+        end
+
+        opts.on('-c', '--[no-]conservative',
+                'Prefer the most recent installed version, ' \
+                'rather than the latest version overall') do |c|
+          options.conservative = c
+        end
+      end
+
+      opt_parse.order!(args) do |v|
+        # put the non-option back at the front of the list of arguments
+        args.unshift(v)
+
+        # stop parsing once we hit the first non-option,
+        # so you can call `gemx rails --version` and it prints the rails
+        # version rather than gemx's
+        break
       end
-      opt_parse.parse!(args) if args.first && args.first.start_with?('-')
+
       abort(opt_parse.help) if args.empty?
+
       options.executable = args.shift
       options.gem_name ||= options.executable
       options.arguments = args
+      options.requirements.requirements.tap(&:uniq).delete(['>=', Gem::Version.new('0')])
+
       options
     end
 
     def self.run!(argv)
-      parse!(argv).tap do |options|
-        options.install_if_needed
-        options.load!
+      parse!(argv).run!
+    end
+
+    def run!
+      print_command if verbose
+      if conservative
+        install_if_needed
+      else
+        install
+        activate!
       end
+
+      load!
     end
 
     private
@@ -115,10 +156,36 @@ module GemX
       home = File.join(home, 'gemx')
       Gem.use_paths(home, Gem.path + [home])
       with_rubygems_config do
-        Gem.install(gem_name, requirements)
+        suppress_always_install do
+          Gem.install(gem_name, requirements)
+        end
       end
     rescue StandardError => e
       abort "Installing #{dependency_to_s} failed:\n#{e.to_s.gsub(/^/, "\t")}"
     end
+
+    def print_command
+      puts "running gemx with:\n"
+      opts = to_h.reject { |_, v| v.nil? }
+      max_length = opts.map { |k, _| k.size }.max
+      opts.each do |k, v|
+        next if v.nil?
+        puts "\t#{k.to_s.rjust(max_length)}: #{v} "
+      end
+      puts
+    end
+
+    def suppress_always_install
+      name = :always_install
+      cls = ::Gem::Resolver::InstallerSet
+      method = cls.instance_method(name)
+      cls.define_method(name) { [] }
+
+      begin
+        yield
+      ensure
+        cls.define_method(name, method)
+      end
+    end
   end
 end

data/lib/gemx/version.rb

@@ -1,3 +1,4 @@
 module GemX
-  VERSION = '0.1.0'.freeze
+  VERSION = File.read(File.expand_path('../../../VERSION', __FILE__))
+                .strip.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERSION
 - bin/console
+- bin/gemx
 - bin/rake
 - bin/rspec
 - bin/rubocop
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.6.10
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Automagically execute commands that come in gem form