mineshaft 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abda75dc3fc8d0746f30db44525932a02cd4764
-  data.tar.gz: 4e8a23ed9db969b77c5e7bd35a2d760769d1697f
+  metadata.gz: 3ba4556a8921cc75e09cbaccf0d8aa5d9159861a
+  data.tar.gz: 96243ff6d1ee7ba0333a1a8627fd69f3709bcf62
 SHA512:
-  metadata.gz: 42978fa1f5ca1221965fd1ab86e21399e430a457b84841e8974e249194a9884a5f5f1941574d2b6b693f06d8cd4e30e8ee6c638f71986422ee8e8284c79a6639
-  data.tar.gz: 59ec612e143939c6234670780d12473711f9b58da440ae25f6b90e44b960781b38a19559e3f576a1f3f79156c2a8b42cf421350d01f66762e0a389a65bf2c232
+  metadata.gz: f9d91dc8878d550169934585bc9ecb5079ac9cc09cead3e98a34dec5c2d77bc31aaa5685e45265f3703cb8e77a33cdd1d0e6f9198b67085a95cbb4e3afe27b09
+  data.tar.gz: 7e945bd43f5f1125d68cd8c1e8e57004d05248f070f52a103078268891a76fe5458d1f67663f097693e52ea3116755788dc8c97f6dbdca19b88716bc4673245b

data/bin/mineshaft

@@ -19,6 +19,7 @@ parser = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Commands"
   opts.separator "    new                              create new environment"
+  opts.separator "    global                           installs Ruby environment globally"
   opts.separator ""
   opts.separator "Options"
 
@@ -44,7 +45,10 @@ end
 
 parser.parse!
 
-if ARGV.include?("new")
+if ARGV[0] == "new"
   dir_name = ARGV[ARGV.index("new") + 1]
   Mineshaft::Environment.new(dir_name, options).create
+elsif ARGV[0] == "global"
+  options[:global] = true
+  Mineshaft::Environment.new(options[:version], options).create
 end

data/environment/activate.sh.erb

@@ -6,6 +6,10 @@ 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

@@ -19,6 +19,7 @@ module Mineshaft
 
     def create
       script_path = File.join(@dir, "bin/activate.sh")
+      script_path.chmod(0755)
       File.truncate(script_path, 0) if File.exist?(script_path)
       @template_file.each do |line|
         File.open(script_path, "a") do |file|

data/lib/mineshaft/environment.rb

@@ -13,24 +13,36 @@ module Mineshaft
     attr_reader :dir
 
     def initialize(dir, options)
-      @dir = dir
+      if options[:global]
+        @dir = File.join(Dir.home, ".mineshaft", dir)
+      else
+        @dir = dir
+      end
       @options = options
+      @versions = YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), '../../versions/versions.yaml'))
+      @version = @options[:version] ? @options[:version] : Mineshaft::Installer.get_latest_stable
     end
 
     def create
       FileUtils::mkdir_p(@dir)
-      versions = YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), '../../versions/versions.yaml'))
-      version = @options[:version] ? @options[:version] : Mineshaft::Installer.get_latest_stable
-      installer = Mineshaft::Installer.new do |config|
-        config.url = versions[version]
+      install_ruby
+      create_template
+    end
+
+    private
+
+    def install_ruby
+      Mineshaft::Installer.new do |config|
+        config.url = @versions[@version]
         config.directory = @dir
-        config.version = version
+        config.version = @version
         config.options = @options
-      end
-      installer.run
+      end.run
+    end
+
+    def create_template
       template_file = File.open(File.join(File.dirname(File.expand_path(__FILE__)), '../../environment/activate.sh.erb'))
-      activate_script = Mineshaft::ActivateTemplate.new(@dir, template_file)
-      activate_script.create
+      Mineshaft::ActivateTemplate.new(@dir, template_file).create
     end
   end
 end

data/lib/mineshaft/version.rb

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

data/versions/versions.yaml

@@ -1,6 +1,7 @@
 ---
 2.5.0: https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.0.tar.gz
 2.5.0-preview1: https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.0-preview1.tar.gz
+2.4.3: https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.3.tar.gz
 2.4.2: https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.2.tar.gz
 2.4.1: https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.1.tar.gz
 2.4.0: https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.0.tar.gz

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mineshaft
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Cameron Testerman