postit 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592a1ecdc94072403c01456d98a308564ae40249
-  data.tar.gz: 32ca570e4c8816ee5a9c217c7784a63c2e8df49e
+  metadata.gz: 505113b5411183f85e338418dce37277817ada47
+  data.tar.gz: 20bf6f84c82093ae1237882c82d8332fdf0a18c6
 SHA512:
-  metadata.gz: d6e538e9198db6c4dfa0d93b3feba47bb801e85f575e6bd4d512a566a5138cd6567523a77ee55dd8a415defa282543a413a06a99bcb254b79ede68910eb9c404
-  data.tar.gz: 68ad6b468c36692cb9f29d1b4e7a2e3b3a4ae90f38151c63263bb1524d353aa30e8bb0fcbd19a1e99e5ba4bc9a978acf01d3ac7ffd6bc148e73138544f4a6412
+  metadata.gz: d0c38a6db156f14af331c519385089c79e6594d6f1cbd37e8887afcb61b33dc69f894b99a7848148d0d8af4062c4022c8db61540bb496ae4a477e3f392b7e536
+  data.tar.gz: e6d39247851e8f6ae30a56ed5180898ab9f1ed9f3820a84decca966453b14fe49f820dcc2cb124bb76dccd72addf5496aedc5a6ab8f99a28a7df602f6b5aad49

data/.rubocop_cocoapods.yml

@@ -6,6 +6,7 @@ AllCops:
   Exclude:
     - ./spec/fixtures/**/*
     - ./vendor/bundle/**/*
+    - ./tmp/**/*
 
 # At the moment not ready to be used
 # https://github.com/bbatsov/rubocop/issues/947

data/.travis.yml

@@ -10,5 +10,67 @@ rvm:
   - 2.1.7
   - 2.2.2
   - 2.3.0
+
+env:
+  - RGV=master
+  - RGV=v2.6.4
+  - RGV=v2.4.8
+
+matrix:
+  include:
+    # Ruby 2.2, Rubygems 2.4.5 and up (included by RGV above)
+    # Ruby 2.1, Rubygems 2.2.2 and up
+    - rvm: 2.1
+      env: RGV=v2.2.5
+    # Ruby 2.0.0, Rubygems 2.0.0 and up
+    - rvm: 2.0.0
+      env: RGV=v2.2.5
+    - rvm: 2.0.0
+      env: RGV=v2.1.11
+    - rvm: 2.0.0
+      env: RGV=v2.0.14
+    # Ruby 1.9.3, Rubygems 1.5.3 and up
+    - rvm: 1.9.3
+      env: RGV=v2.2.5
+    - rvm: 1.9.3
+      env: RGV=v2.1.11
+    - rvm: 1.9.3
+      env: RGV=v2.0.14
+    - rvm: 1.9.3
+      env: RGV=v1.8.29
+    - rvm: 1.9.3
+      env: RGV=v1.7.2
+    - rvm: 1.9.3
+      env: RGV=v1.6.2
+    - rvm: 1.9.3
+      env: RGV=v1.5.3
+    # Ruby 1.8.7, Rubygems 1.3.6 and up
+    - rvm: 1.8.7
+      env: RGV=v2.2.5
+    - rvm: 1.8.7
+      env: RGV=v2.0.14
+    - rvm: 1.8.7
+      env: RGV=v1.8.29
+    - rvm: 1.8.7
+      env: RGV=v1.7.2
+    - rvm: 1.8.7
+      env: RGV=v1.6.2
+    - rvm: 1.8.7
+      env: RGV=v1.5.3
+    - rvm: 1.8.7
+      env: RGV=v1.4.2
+    - rvm: 1.8.7
+      env: RGV=v1.3.7
+    - rvm: 1.8.7
+      env: RGV=v1.3.6
+
+    # ALLOWED FAILURES
+    # For no apparent reason, this often goes over the Travis limit
+    - rvm: 1.8.7
+      env: RGV=v2.1.11
+    # Ruby-head (we want to know how we're doing, but not fail the build)
+    - rvm: ruby-head
+      env: RGV=master
+
 before_install: ./bin/setup
-script: rake
+script: ./bin/rake

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.2.0
+
+##### Enhancements
+
+* Support RubyGems back to 1.3.6.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Refactor installation so the installer can be used separately from
+  `postit/setup`.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.1.2 (2016-04-25)
 
 ##### Enhancements
@@ -6,7 +18,7 @@
   [Samuel Giddins](https://github.com/segiddins)
   [#2](https://github.com/bundler/postit/issues/2)
 
-##### Enhancements
+##### Bug Fixes
 
 * Invoke a pre-release bundler version if no particular requirement is needed,
   in keeping with recent RubyGems versions.  

data/bin/console

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+load File.expand_path('../with_rubygems', __FILE__) if ENV['RGV']
+
 require 'postit'
 
 require 'irb'

data/bin/rake

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+load File.expand_path('../with_rubygems', __FILE__) if ENV['RGV']
+
 require 'rubygems'
 gemspec = Gem::Specification.load(
   File.expand_path('../../postit.gemspec', __FILE__))

data/bin/rspec

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+load File.expand_path('../with_rubygems', __FILE__) if ENV['RGV']
+
 require 'rubygems'
 gemspec = Gem::Specification.load(
   File.expand_path('../../postit.gemspec', __FILE__))

data/bin/with_rubygems

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'pathname'
+
+def run(*cmd)
+  return if system(*cmd)
+  raise "Running `#{cmd.join(' ')}` failed"
+end
+
+version = ENV.delete('RGV')
+rubygems_path = Pathname.new(__FILE__).join('../../tmp/rubygems').expand_path
+unless rubygems_path.directory?
+  rubygems_path.parent.mkpath unless rubygems_path.directory?
+  run('git', 'clone',
+      'https://github.com/rubygems/rubygems.git', rubygems_path.to_s)
+end
+Dir.chdir(rubygems_path) do
+  version = "v#{version}" if version =~ /\A\d/
+  run('git', 'checkout', version, '--quiet')
+end if version
+
+rubygems_lib = rubygems_path + 'lib'
+ENV['RUBYOPT'] = %(-I#{rubygems_lib} #{ENV['RUBYOPT']})
+
+if $0 != __FILE__
+  ARGV.unshift($0)
+elsif cmd = ARGV.first
+  possible_dirs = [
+    Pathname.new(__FILE__) + '..',
+    Pathname.new(__FILE__) + '../../exe',
+    rubygems_path + 'bin',
+  ]
+  cmd = possible_dirs.map do |dir|
+    dir.join(cmd).expand_path
+  end.find(&:file?)
+  ARGV[0] = cmd.to_s if cmd
+end
+
+exec(*ARGV)

data/lib/postit.rb

@@ -1,6 +1,7 @@
-require 'postit/version'
 require 'postit/environment'
+require 'postit/installer'
 require 'postit/parser'
+require 'postit/version'
 require 'rubygems'
 
 module PostIt

data/lib/postit/installer.rb

@@ -0,0 +1,28 @@
+module PostIt
+  class Installer
+    def initialize(bundler_version)
+      @bundler_version = bundler_version
+    end
+
+    def installed?
+      if Gem::Specification.respond_to?(:find_by_name)
+        !Gem::Specification.find_by_name('bundler', @bundler_version).nil?
+      else
+        requirement = Gem::Requirement.new(@bundler_version)
+        Gem.source_index.gems.values.any? do |s|
+          s.name == 'bundler' && requirement.satisfied_by?(s.version)
+        end
+      end
+    rescue LoadError
+      false
+    end
+
+    def install!
+      return if installed?
+      require 'rubygems/dependency_installer'
+      installer = Gem::DependencyInstaller.new
+      installer.install('bundler', @bundler_version)
+      installer.installed_gems
+    end
+  end
+end

data/lib/postit/setup.rb

@@ -1,16 +1,12 @@
 require 'postit/environment'
+require 'postit/installer'
 
 environment = PostIt::Environment.new(ARGV)
 version = environment.bundler_version
 
-loop do
-  begin
-    gem 'bundler', version
-    break
-  rescue Gem::LoadError
-    nil
-  end
-  Gem.install('bundler', version)
-end
+installer = PostIt::Installer.new(version)
+installer.install!
+
+gem 'bundler', version
 
 require 'bundler/version'

data/lib/postit/version.rb

@@ -1,3 +1,3 @@
 module PostIt
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/postit.gemspec

@@ -5,7 +5,7 @@ require 'postit/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'postit'
-  spec.version       = PostIt::VERSION
+  spec.version       = PostIt::VERSION.dup
   spec.authors       = ['Samuel Giddins']
   spec.email         = ['segiddins@segiddins.me']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,9 +87,11 @@ files:
 - bin/rspec
 - bin/rubocop
 - bin/setup
+- bin/with_rubygems
 - exe/postit
 - lib/postit.rb
 - lib/postit/environment.rb
+- lib/postit/installer.rb
 - lib/postit/parser.rb
 - lib/postit/setup.rb
 - lib/postit/version.rb
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The Bundler version manager