mineshaft 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c5ce0cd0c41d4f8477fd9474cd686c001da38338a73c3dad31143db984d83a
-  data.tar.gz: a7f28ff5796900d12e2ea2d7914fab05a288de4ca0093f858ab845c38889285f
+  metadata.gz: 615fbc3af4fb7f9b59cc8fc460187d716231a87132167ea33c9e5b99e7bb09fd
+  data.tar.gz: da87f368e837efd12e05861becce3fa2e6ce639f79bd2af620778af9d6c13652
 SHA512:
-  metadata.gz: 130917145cbd610b4d6a6b6d5f59518f2f1b47bb5541c6eb44afddb1943c22979c42bda2cbc4dbfd7654dc8d283580618341d3d6e2f402dc2216ab029a6f564d
-  data.tar.gz: f71044bac92d69468bfcb3521bc8fc0dc3eaba4cf5704843018602deed55d2dbd475c71bda398729897722e42ef84de64a84ff2856c1885c1c669b7b4de0db1e
+  metadata.gz: 55a67edac8f378be32468c05bdedb43df8908f03838a98b4f81c99cd0b2be59837a7e81924c4ad686bf8b76de9069d0b4e9b4fe06725dbd192d7d4063e5051c8
+  data.tar.gz: a7deb29fe60d8e3792ed54c075d1f597daa171e1d6875ea407f5c99d407f5bbd9a27ac15df091abf06a863d8808c714d584d453fe7c47572447037160b5b33c4

data/bin/ms

@@ -6,7 +6,7 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2017-04-14 1:19PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 require "mineshaft"
 require "optparse"
@@ -18,24 +18,14 @@ options = {
   global: false
 }
 
-if ARGV[0] == "new"
-  new_arg = ARGV[ARGV.index("new") + 1]
-  new_env = true
-elsif ARGV[0] == "list"
-  Mineshaft::List.display
-elsif ARGV[0] == "reload"
-  reload = true
-elsif ARGV[0] == "use"
-  environment = ARGV[ARGV.index("use") + 1]
-  use_environment = true
-end
-
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: ms [command] [options]"
   opts.separator ""
   opts.separator "Commands"
-  opts.separator "    new                              creates new environment"
+  opts.separator "    env                              shows a list of all installed global Rubies, with the current one in use highlighted"
+  opts.separator "    install                          installs a new global Ruby"
   opts.separator "    list                             lists the ten latest versions of Ruby available to install"
+  opts.separator "    new                              creates new environment"
   opts.separator "    reload                           reloads binaries using the current global Ruby version"
   opts.separator "    use                              selects an installed global Ruby environment to use"
   opts.separator ""
@@ -48,46 +38,47 @@ parser = OptionParser.new do |opts|
       exit
   end
 
-  opts.on("-r",
-    "--ruby-version VERSION",
-    "specify the version of Ruby to install") do |version|
-      options[:version] = version
-  end
-
   opts.on("-o",
     "--with-openssl-dir DIR",
     "specify the directory where OpenSSL is installed") do |openssl_dir|
       options[:openssl_dir] = openssl_dir
   end
 
-  opts.on("-g",
-    "--global",
-    "install the Ruby environment globally") do |global|
-    options[:global] = true
-    options[:version] = new_arg
-  end
-
   opts.on("-n",
     "--no-openssl-dir",
     "do not set the OpenSSL directory - otherwise this defaults to /usr/local/opt/openssl") do |no_openssl|
       options[:no_openssl_dir] = true
   end
-
-  opts.on("-i",
-    "--installed",
-    "lists the globally installed and available Rubies") do |installed|
-    options[:installed] = true
-  end
 end
 
 parser.parse!
 
-Mineshaft.reload_binaries if reload
-Mineshaft.list_globals    if options[:installed]
+case ARGV[0]
+when "env"
+  Mineshaft.env
+when "install"
+  options[:global] = true
 
-if use_environment
+  if ARGV[1]
+    options[:version] = ARGV[1] if ARGV[1]
+    name = options[:version]
+  else
+    name = Mineshaft::Constants::RUBY_VERSION_STABLE
+  end
+
+  Mineshaft.new(name, options)
+when "list"
+  Mineshaft.list
+when "new"
+  name = ARGV[ARGV.index("new") + 1]
+  options[:version] = ARGV[2] if ARGV[2]
+  Mineshaft.new(name, options)
+when "reload"
+  Mineshaft.reload
+when "use"
+  name = ARGV[ARGV.index("use") + 1]
   options[:global] = true
-  Mineshaft::Environment.new(environment, options).use 
+  Mineshaft.use(name, options)
+else
+  puts "Unrecognized command - #{ARGV[0]}" 
 end
-
-Mineshaft::Environment.new(new_arg, options).create if new_env

data/lib/mineshaft.rb

@@ -4,12 +4,10 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2017-04-14 1:19PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 require "mineshaft/constants"
-require "mineshaft/list"
-require "mineshaft/list_globals"
-require "mineshaft/reload"
 require "mineshaft/environment"
 require "mineshaft/installer"
 require "mineshaft/version"
+require "mineshaft/commands"

data/lib/mineshaft/commands.rb

@@ -0,0 +1,58 @@
+# mineshaft
+#
+# author:: Cameron Testerman
+# email:: cameronbtesterman@gmail.com
+# created:: 2018-12-15 10:20PM
+#
+# Copyright (c) 2017-2019 Cameron Testerman
+
+require 'yaml'
+
+module Mineshaft
+  def self.env
+    rubies = Dir["#{Mineshaft::Constants::GLOBAL_DIR}/*"]
+    rubies.delete Mineshaft::Constants::GLOBAL_BIN
+
+    puts "Globally installed Ruby versions"
+    puts "--------------------------------"
+    rubies.each { |ruby| puts ruby.split("/").last }
+  end
+
+  def self.environment(name, options)
+    Mineshaft::Environment.new(name, options)
+  end
+
+  def self.new(name, options)
+    environment(name, options).create
+  end
+
+  def self.use(name, options)
+    environment(name, options).use
+  end
+
+  def self.reload
+    ruby = File.readlink("#{Dir.home}/.mineshaft/bin/ruby").split('/')
+    bin_dir = ruby.shift(ruby.length - 1).join("/")
+    FileUtils.rm Dir.glob("#{Dir.home}/.mineshaft/bin/*")
+
+    Dir["#{bin_dir}/*"].each do |binary_absolute|
+      binary = binary_absolute.split("/").last
+      FileUtils::ln_s binary_absolute, "#{Dir.home}/.mineshaft/bin/#{binary}" 
+    end
+
+    puts "Binaries successfully reloaded!"
+  end
+
+  def self.list
+    versions = YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), '../../versions/versions.yaml'))
+    last_ten = []
+
+    Hash[versions.sort_by {|k, v| -v }[versions.length - 10..versions.length]].each do |version, url|
+      last_ten.push(version)
+    end
+
+    puts "Latest 10 Ruby versions available for download"
+    puts "--------------------------------"
+    last_ten.reverse.each {|ver| puts ver}
+  end
+end

data/lib/mineshaft/constants.rb

@@ -4,11 +4,11 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2018-07-02 9:27PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 module Mineshaft
   module Constants
-    RUBY_VERSION_STABLE = '2.5.3'
+    RUBY_VERSION_STABLE = '2.6.0'
     GLOBAL_DIR = "#{Dir.home}/.mineshaft"
     GLOBAL_BIN = "#{GLOBAL_DIR}/bin"
   end

data/lib/mineshaft/date.rb

@@ -3,7 +3,7 @@
 # author:: Cameron Testerman
 # email:: cameronbtesterman@gmail.com
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 module Mineshaft
   module Date

data/lib/mineshaft/environment.rb

@@ -4,11 +4,11 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2017-04-14 1:19PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 require 'fileutils'
 require 'yaml'
-require 'mineshaft/reload'
+require 'mineshaft/commands'
 
 module Mineshaft
   class Environment
@@ -27,7 +27,7 @@ module Mineshaft
       if @options[:global]
         set_new_global
         `gem install mineshaft`
-        Mineshaft.reload_binaries
+        Mineshaft.reload
       else
         create_activate_script
       end

data/lib/mineshaft/installer.rb

@@ -4,7 +4,7 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2017-04-14 1:19PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 require 'fileutils'
 require 'net/http'
@@ -88,12 +88,20 @@ module Mineshaft
 
     def configure_options(prefix)
       config = @global ? "./configure --prefix #{@directory}" : "./configure --prefix #{File.expand_path(@directory)}"
-      config << " --with-openssl-dir=#{@options[:openssl_dir]}" unless @options[:no_openssl_dir]
+
+      if @options[:no_openssl_dir]
+        config
+      else
+        config << " --with-openssl-dir=#{@options[:openssl_dir]}"
+      end
+
+      return config
     end
 
     def build(prefix)
       puts "Building environment in #{prefix}"
       puts "Directory is #{@directory}"
+      puts @options[:no_openssl_dir]
       dir = "#{@directory}/ruby-#@version"
       commands = [
         "chmod +x configure tool/ifchange",

data/lib/mineshaft/shell.rb

@@ -4,7 +4,7 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2017-10-23 7:01PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 module Mineshaft
   module Shell

data/lib/mineshaft/version.rb

@@ -4,8 +4,8 @@
 # email:: cameronbtesterman@gmail.com
 # created:: 2017-04-14 1:19PM
 #
-# Copyright (c) 2017-2018 Cameron Testerman
+# Copyright (c) 2017-2019 Cameron Testerman
 
 module Mineshaft
-  VERSION = "3.1.0"
+  VERSION = "4.0.0"
 end

data/versions/versions.yaml

@@ -330,3 +330,5 @@
 2.6.0-preview2: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0-preview2.tar.gz
 2.6.0-preview3: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0-preview3.tar.gz
 2.6.0-rc1: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0-rc1.tar.gz
+2.6.0-rc2: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0-rc2.tar.gz
+2.6.0: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0.tar.gz

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mineshaft
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Cameron Testerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -33,14 +33,11 @@ extra_rdoc_files: []
 files:
 - bin/ms
 - lib/mineshaft.rb
+- lib/mineshaft/commands.rb
 - lib/mineshaft/constants.rb
 - lib/mineshaft/date.rb
-- lib/mineshaft/env_list.rb
 - lib/mineshaft/environment.rb
 - lib/mineshaft/installer.rb
-- lib/mineshaft/list.rb
-- lib/mineshaft/list_globals.rb
-- lib/mineshaft/reload.rb
 - lib/mineshaft/shell.rb
 - lib/mineshaft/version.rb
 - versions/versions.yaml
@@ -63,8 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby virtual environment manager

data/lib/mineshaft/env_list.rb

@@ -1,14 +0,0 @@
-# mineshaft
-#
-# author:: Cameron Testerman
-# email:: cameronbtesterman@gmail.com
-# created:: 2018-09-20 10:23PM
-#
-# Copyright (c) 2017-2018 Cameron Testerman
-
-module Mineshaft
-  def Mineshaft.env_list
-    # This should output a list of globally installed Rubies.
-    # The currently used environment should be highlighted.
-  end
-end

data/lib/mineshaft/list.rb

@@ -1,24 +0,0 @@
-# mineshaft
-#
-# author:: Cameron Testerman
-# email:: cameronbtesterman@gmail.com
-# created:: 2018-07-03 9:16PM
-#
-# Copyright (c) 2017-2018 Cameron Testerman
-
-require 'yaml'
-
-module Mineshaft
-  module List
-    def List.display
-      versions = YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), '../../versions/versions.yaml'))
-      last_ten = []
-
-      Hash[versions.sort_by {|k, v| -v }[versions.length - 10..versions.length]].each do |version, url|
-        last_ten.push(version)
-      end
-
-      last_ten.reverse.each {|ver| puts ver}
-    end
-  end
-end

data/lib/mineshaft/list_globals.rb

@@ -1,18 +0,0 @@
-# mineshaft
-#
-# author:: Cameron Testerman
-# email:: cameronbtesterman@gmail.com
-# created:: 2018-08-04 11:42PM
-#
-# Copyright (c) 2017-2018 Cameron Testerman
-
-module Mineshaft
-  def Mineshaft.list_globals
-    rubies = Dir["#{Mineshaft::Constants::GLOBAL_DIR}/*"]
-    rubies.delete Mineshaft::Constants::GLOBAL_BIN
-
-    puts "Globally installed Ruby versions"
-    puts "--------------------------------"
-    rubies.each { |ruby| puts ruby.split("/").last }
-  end
-end

data/lib/mineshaft/reload.rb

@@ -1,22 +0,0 @@
-# mineshaft
-#
-# author:: Cameron Testerman
-# email:: cameronbtesterman@gmail.com
-# created:: 2018-07-03 9:53PM
-#
-# Copyright (c) 2017-2018 Cameron Testerman
-
-module Mineshaft
-  def Mineshaft.reload_binaries
-    ruby = File.readlink("#{Dir.home}/.mineshaft/bin/ruby").split('/')
-    bin_dir = ruby.shift(ruby.length - 1).join("/")
-    FileUtils.rm Dir.glob("#{Dir.home}/.mineshaft/bin/*")
-
-    Dir["#{bin_dir}/*"].each do |binary_absolute|
-      binary = binary_absolute.split("/").last
-      FileUtils::ln_s binary_absolute, "#{Dir.home}/.mineshaft/bin/#{binary}" 
-    end
-
-    puts "Binaries successfully reloaded!"
-  end
-end