dockershell 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4ea96dd7610b476d4fc51ac64945bd935a0c66
-  data.tar.gz: efd2a909162434eaa8446c0bbf7f2f2f578254dd
+  metadata.gz: 12f632fb1a6296ff8d42f8adc7a4880e5a9242e3
+  data.tar.gz: c193beafb5f9d003387cb75d4b0d4c01ddb47fee
 SHA512:
-  metadata.gz: 646561ae7ef2869024cbe57e1a2beb868f8e902e5863352fc59c7c29e9cd81d88dc465e32c08a70c66344bf5d8afdc8569fd23ff475773c9a405ad34808f4a29
-  data.tar.gz: 076319a5aaa3af6fe0d01b120904198dfe2c29f04edfd5040d365265d4205f0371a9bced9b5f95030e33c55978493b9358c7c514a408eabe8024337ad8225c99
+  metadata.gz: 728f59212b2cca5cb5972df7b0a36c831c6f739df02835e016f91cedb76a0f228dfe11330caa98d14f5127a837259ff9908bf1b4f7f0f83596f333e8cb5b206c
+  data.tar.gz: 176232401bc291f1684e6ff692a979d186dc462fe0038383ef0f40f6e76b83241abc49259957a6d8f78b09790b544ae8be97f3582285b9ba96ad839b20b86cbb

data/bin/dockershell

@@ -25,6 +25,7 @@ options = {
 options.merge!(YAML.load_file(config)) if File.file? config
 options[:logger] = Logger.new(options[:logfile])
 options[:logger].level = Logger::const_get(options[:loglevel].upcase)
+options[:profile] = options[:profiles][:default] if options[:profiles].include? :default
 
 optparse = OptionParser.new { |opts|
     opts.banner = "Usage : dockershell [-p <profile>] [-n <name>] [-d]

data/lib/dockershell.rb

@@ -33,16 +33,16 @@ class Dockershell
   end
 
   [:prerun, :setup, :postrun].each do |task|
-	  define_method(task) do
+    define_method(task) do
       return unless @options[:profile].include? task
       script = which(@options[:profile][task]) || return
-  	  @logger.debug "#{task}: #{script} #{@options[:fqdn]} #{@options[:option]}"
+      @logger.debug "#{task}: #{script} #{@options[:fqdn]} #{@options[:option]}"
 
-  	  # This construct allows us to have an optional 2nd parameter to the script
+      # This construct allows us to have an optional 2nd parameter to the script
       output, status = Open3.capture2e(*[script, @options[:fqdn], @options[:option]].compact)
       @logger.debug output
       bomb "#{task} task '#{script} #{@options[:name]} #{@options[:option]}' failed." unless status.success?
-  	end
+    end
   end
 
   # This spawns a detached process to clean up. This is so it doesn't die when the parent is killed
@@ -101,8 +101,13 @@ private
       '--expose=80', '-Ptd',
     ]
 
+    formatvars = {
+      :name => @options[:name],
+      :fqdn => @options[:fqdn],
+    }
+    
     @options[:profile][:volumes].each do |volume|
-      args << '--volume' << volume
+      args << '--volume' << volume % formatvars
     end
 
     args << @options[:profile][:image] << '/sbin/init'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockershell
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -36,8 +36,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/dockershell
-- lib/dockershell/wordgen.rb
 - lib/dockershell.rb
+- lib/dockershell/wordgen.rb
 - resources/places.txt
 - scripts/course_selector
 - scripts/pe_classify
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Provides a user shell backed by  a Docker container.