mineshaft 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 329013af9e0a1586742f426e5078b098c94ae4d301670716b6b9a4e4eccb342c
-  data.tar.gz: 5bd6fb460979c690dab830107b99cd1e3dcdb827e458725a1ff5dcb37309ad8a
+  metadata.gz: 62f522f830f314227af21ede58ce1acbdcf8b76a713787749cf50715a912f01a
+  data.tar.gz: 2fb777669454a23f05e6b6c2de6880739361b1cf738cdb923775bb33a9278b33
 SHA512:
-  metadata.gz: e9d5e5f4fce2cd3a6aec076830449a3422fc81735b24a2afb32c43b022d28292a3fd5e37a08894a4e11abc2377c91fc3525d5f0b733631349c76eac39cfbb8ed
-  data.tar.gz: 9455d6fb499cb6a3732c2595045e191cd50cd752ad92917620419a9faef32abd6a76da1e6c3afe5b3cdfc256b174bf0a60947d4bd7699ad3768d228b6e8178c5
+  metadata.gz: 0d44e9d24c486982c95838dda20137fa03243eccd3dcc26bb60409a821afea1d7a9c80b919b60cd2b186b3d5f070149031f5a8c74c4e7e0d50d0e6c5199572e0
+  data.tar.gz: 22a6abd87f3eccdab50c5bcc7a55c1ae9c050426ae9d7276259d0474b060ddd52db8fa704d5c3524ec00dd662f0a6bcedfd03ff02a51c9c86a56ee6b0b572cc9

data/bin/ms

@@ -67,6 +67,12 @@ parser = OptionParser.new do |opts|
     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|

data/lib/mineshaft.rb

@@ -13,4 +13,3 @@ require "mineshaft/reload"
 require "mineshaft/environment"
 require "mineshaft/installer"
 require "mineshaft/version"
-require "mineshaft/activate"

data/lib/mineshaft/constants.rb

@@ -8,7 +8,7 @@
 
 module Mineshaft
   module Constants
-    RUBY_VERSION_STABLE = '2.5.1'
+    RUBY_VERSION_STABLE = '2.5.3'
     GLOBAL_DIR = "#{Dir.home}/.mineshaft"
     GLOBAL_BIN = "#{GLOBAL_DIR}/bin"
   end

data/lib/mineshaft/environment.rb

@@ -8,6 +8,7 @@
 
 require 'fileutils'
 require 'yaml'
+require 'mineshaft/reload'
 
 module Mineshaft
   class Environment
@@ -29,8 +30,10 @@ module Mineshaft
       install_ruby
       if @options[:global]
         set_new_global
+        `gem install mineshaft`
+        Mineshaft.reload_binaries
       else
-        create_template
+        create_activate_script
       end
     end
 
@@ -51,9 +54,28 @@ module Mineshaft
       end.run
     end
 
-    def create_template
-      template_file = File.open(File.join(File.dirname(File.expand_path(__FILE__)), '../../environment/activate.sh.erb'))
-      Mineshaft::ActivateTemplate.new(@dir, template_file).create
+    def install_mineshaft
+    end
+
+    def create_activate_script
+      open("#{@dir}/bin/activate.sh", 'w') do |f|
+        f << "#!/bin/bash\n"
+        f << "#\n"
+        f << "# activate.sh\n"
+        f << "\n"
+        f << "OLDPS1=$PS1\n"
+        f << "ENV=#{@dir}\n"
+        f << 'PS1="($ENV)${OLDPS1}"'
+        f << "\n"
+        f << "\n"
+        f << "OLDPATH=$PATH\n"
+        f << "PATH=#{File.expand_path("#{@dir}/bin")}:$OLDPATH\n"
+        f << "\n"
+        f << "deactivate() {\n"
+        f << "  PS1=$OLDPS1\n"
+        f << "  PATH=$OLDPATH\n"
+        f << "}\n\n"
+      end
     end
 
     def set_new_global

data/lib/mineshaft/installer.rb

@@ -86,11 +86,12 @@ module Mineshaft
 
     def configure_options(prefix)
       config = @global ? "./configure --prefix #{@directory}" : "./configure --prefix #{File.expand_path(@directory)}"
-      config << " --with-openssl-dir=#{@options[:openssl_dir]}"
+      config << " --with-openssl-dir=#{@options[:openssl_dir]}" unless @options[:no_openssl_dir]
     end
 
     def build(prefix)
       puts "Building environment in #{prefix}"
+      puts "Directory is #{@directory}"
       dir = "#{@directory}/ruby-#@version"
       commands = [
         "chmod +x configure tool/ifchange",
@@ -99,7 +100,6 @@ module Mineshaft
         "make install"
       ]
       commands.each { |command| shell(dir, command) }
-      shell dir, 'bin/gem install mineshaft'
     end
   end
 end

data/lib/mineshaft/shell.rb

@@ -9,7 +9,7 @@
 module Mineshaft
   module Shell
     def shell(dir, cmd)
-      puts "Running #{cmd}"
+      puts "Running cd #{dir} && #{cmd}"
       %x{ cd #{dir} && #{cmd} }
     end
   end

data/lib/mineshaft/version.rb

@@ -7,5 +7,5 @@
 # Copyright (c) 2017-2018 Cameron Testerman
 
 module Mineshaft
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mineshaft
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Cameron Testerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,9 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ms
-- environment/activate.sh.erb
 - lib/mineshaft.rb
-- lib/mineshaft/activate.rb
 - lib/mineshaft/constants.rb
 - lib/mineshaft/date.rb
 - lib/mineshaft/env_list.rb

data/environment/activate.sh.erb

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# activate.sh
-
-OLDPS1=$PS1
-ENV=<%= $ENVDIR %>
-PS1="($ENV)${OLDPS1}"
-
-OLDPATH=$PATH
-PATH=<%= File.expand_path("#$ENVDIR/bin") %>:$OLDPATH
-
-deactivate() {
-  PS1=$OLDPS1
-  PATH=$OLDPATH
-}

data/lib/mineshaft/activate.rb

@@ -1,50 +0,0 @@
-# mineshaft
-#
-# author:: Cameron Testerman
-# email:: cameronbtesterman@gmail.com
-# created:: 2017-10-26 8:46PM
-#
-# Copyright (c) 2017-2018 Cameron Testerman
-
-require 'erb'
-
-module Mineshaft
-  class ActivateTemplate
-    attr_reader :result, :ENVDIR
-
-    def initialize(dir, template_file)
-      @dir = dir
-      @template_file = read(template_file)
-      $ENVDIR = dir
-    end
-
-    def create
-      script_path = File.join(@dir, "bin/activate.sh")
-
-      if File.exist?(script_path)
-        File.truncate(script_path, 0)
-        mode = 'w'
-      end
-
-      mode ||= 'a'
-
-      @template_file.each do |line|
-        File.open(script_path, mode) do |file|
-          file.write(render(line))
-        end
-      end
-
-      File.chmod(0755, script_path)
-    end
-
-    private
-
-    def render(line)
-      ERB.new(line).result
-    end
-
-    def read(file)
-      File.open(file).readlines
-    end
-  end
-end