mineshaft 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e11df319043122c74bab2d8148dc30a48811f614
-  data.tar.gz: 7636c96c94070bc76b7289a67da21d275d428450
+  metadata.gz: e99ffb52da7f6667663e90bd5139530d3640bf57
+  data.tar.gz: f991da105f10417463fb6cdad66ea10375756b49
 SHA512:
-  metadata.gz: e6931e961db2057c40a64bcef81feee98392ad819c9998f462156850acf2c9ab11622859a7bfce7ae852265aa5ef798da6233c1de19eddec11231c1b5c2f43bc
-  data.tar.gz: 653d7e2dbbfe6d6553f8abc15f51aa748ee28bc08dd6d59d5ae1e595b4e9fc42ce6fb47b2bcce5d0af5953e636749ac19a87f8c9616c80d6a2c993d76a0cfff8
+  metadata.gz: 806411af7a7f9b276457e222bad45e233dc1691a4e3150a45824b9d6e7af21f86804080d1c22370900201f06b188222e0df3565024d155634d7d2cd49847fa03
+  data.tar.gz: df0b3e02e41c1bdf78df025e3b94f73327fa99595413ef558d1f3ca1e8c76db2eaa8a8f9bf6b29ab7640dac91cd033fc6e35ad975ae765302d1903093b8a9ece

data/bin/mineshaft

@@ -15,18 +15,30 @@ require "yaml"
 options = {}
 
 parser = OptionParser.new do |opts|
-  opts.banner = "usage: minecart [options] environment"
+  opts.banner = "Usage: mineshaft [command] [options]"
+  opts.separator ""
+  opts.separator "Commands"
+  opts.separator "    new                              create new environment"
+  opts.separator ""
+  opts.separator "Options"
 
-  opts.on("-v", "--version", "displays the current version of minecart") do
-    puts "#{Mineshaft::VERSION[:name]} v#{Mineshaft::VERSION[:number]}"
-    exit
+  opts.on("-v",
+    "--version",
+    "displays the current version of minecart") do
+      puts "#{Mineshaft::VERSION[:name]} v#{Mineshaft::VERSION[:number]}"
+      exit
   end
 
   opts.on("-r",
-          "--ruby-version VERSION",
-          "specify the version of Ruby to install"
-         ) do |version|
-    options[:version] = version
+    "--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
 end
 

data/lib/mineshaft/environment.rb

@@ -25,6 +25,7 @@ module Mineshaft
         config.url = versions[version]
         config.directory = @dir
         config.version = version
+        config.options = @options
       end
       installer.run
     end

data/lib/mineshaft/installer.rb

@@ -14,7 +14,7 @@ require 'mineshaft/shell'
 
 module Mineshaft
   class Installer
-    attr_accessor :url, :directory, :version
+    attr_accessor :url, :directory, :version, :options
 
     include Mineshaft::Shell
 
@@ -27,6 +27,14 @@ module Mineshaft
       "2.4.2"
     end
 
+    def run
+      download @url, @directory
+      unzip          @directory
+      build          @directory
+    end
+
+    private
+
     def find_slash_indices(url)
       slash_array = []
       url = url.split("")
@@ -68,30 +76,31 @@ module Mineshaft
       FileUtils::mkdir_p("#{dir}/ruby-#@version")
       tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open("#{dir}/#@ruby_archive"))
       tar_extract.rewind
+      puts "Unzipping archive"
       tar_extract.each do |entry|
-        puts entry.full_name
         if entry.directory?
           FileUtils::mkdir_p("#{dir}/#{entry.full_name}")
         elsif entry.file?
           File.open("#{dir}/#{entry.full_name}", 'w') {|file| file.write(entry.read)}
         end
       end
+      puts "Archive successfully unzipped"
       tar_extract.close
     end
 
-    def run
-      download(@url, @directory)
-      unzip(@directory)
-      build(@directory)
+    def configure_options(prefix)
+      config = "./configure --prefix #{Dir.pwd}/#{prefix}"
+      config << " --with-openssl-dir=#{@options[:openssl_dir]}"
     end
 
     def build(prefix)
+      puts "Building environment in #{prefix}"
       dir = "#{Dir.pwd}/#{prefix}/ruby-#@version"
       commands = [
-        "sudo chmod +x configure tool/ifchange",
-        "sudo ./configure --prefix #{Dir.pwd}/#{prefix}",
-        "sudo make",
-        "sudo make install"
+        "chmod +x configure tool/ifchange",
+        configure_options(prefix),
+        "make",
+        "make install"
       ]
       commands.each { |command| shell(dir, command) }
     end

data/lib/mineshaft/shell.rb

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

data/lib/mineshaft/version.rb

@@ -9,6 +9,6 @@
 module Mineshaft
   VERSION = {
     name: "mineshaft",
-    number:  "0.3.0"
+    number:  "0.4.0"
   }
 end

data/versions/versions.yaml

@@ -1,3 +1,6 @@
 ---
+2.5.0-preview1: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.0-preview1.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
 2.3.5: https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.5.tar.gz

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mineshaft
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cameron Testerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: cameronbtesterman@gmail.com
@@ -17,13 +17,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/mineshaft
-- lib/mineshaft.rb
 - lib/mineshaft/environment.rb
 - lib/mineshaft/installer.rb
 - lib/mineshaft/shell.rb
 - lib/mineshaft/version.rb
+- lib/mineshaft.rb
 - versions/versions.yaml
+- bin/mineshaft
 homepage: https://github.com/camerontesterman/mineshaft
 licenses:
 - MIT
@@ -34,17 +34,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby virtual environment manager