Hitcher 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411230019f3723d05e63778315585d6322e9cc0c4a993e7b511a34ad52308d47
-  data.tar.gz: 38ad9fbba5717a918d47fd46dcad40c443c72e3a6ecec4b1555a0e3c8d939565
+  metadata.gz: c704dac6c0d16f1ea205f56b4db516dfc770410440a029d7cd86788cb7f44880
+  data.tar.gz: cfd93e85396c9bed3861174855fca23975bcd2f8e63228c79f89fac0a02da3ec
 SHA512:
-  metadata.gz: 4620b51e90ca16093a34789b3124dcf8c0d95a604bb85ad50f09adb261e3b4f163fed818fa20b5025dd64b7eeb29f674a636b4abf10d6194a20c50cb0c26d0ed
-  data.tar.gz: ab955dbda244b81935da8e1994d847cb9c9ee64c5414822b80411b492f39aab5534d03dadfca8058a7626169d9bbd36dae4e70557bd16a424e1a4cd5d1839a83
+  metadata.gz: c3916785736693d66ba40f332e4d3997a74b6022c6f9e13dc9118827cea692095b699675b5270c6e022e4dd9e349222c616bff3beea6a8341e26204217cf3e00
+  data.tar.gz: 8cc2d5aed26cde231aa676380304bc42a3b39e535f44e86b1e9e4b16141905b7e2b5af393ebb383aae385ccf63f9508234e75b5fb5b7fc5af200b604a4eb331b

data/exe/hitcher

@@ -26,6 +26,8 @@ if File.exist?(cs)
       cli.run_prompt(inst)
     when "run_new_prompt", "rnp"
       cli.run_new_prompt(inst)
+    when "gen", "g", "generate", "gs", "gen_script"
+      cli.generate_scripts(inst)
     when "-v"
       STDOUT.puts "Hitcher version #{Hitcher::VERSION}"
     else

data/lib/hitcher.rb

@@ -2,6 +2,7 @@ require "hitcher/version"
 
 require_relative 'hitcher/dsl'
 require_relative 'hitcher/run_ops'
+require_relative 'hitcher/gen_ops'
 
 module Hitcher
   class Error < StandardError; end
@@ -12,6 +13,7 @@ module Hitcher
   class Cli
     include Hitcher::Dsl
     include Hitcher::CliOps::RunOps
+    include Hitcher::CliOps::GenOps
 
     # DSL start here!
     def parse(spec)

data/lib/hitcher/command_runner.rb

@@ -2,9 +2,12 @@
 require 'toolrack'
 require 'tempfile'
 
+require_relative 'user_prompt'
+
 module Hitcher
   module CommandRunner
     include Antrapol::ToolRack::ConditionUtils
+    include Hitcher::UserPrompt
     # functions to assist in running a command line app
 
     class TerminalNotDefined < StandardError; end
@@ -12,7 +15,7 @@ module Hitcher
     def run_in_new_terminal(cmd, &block)
       term = Hitcher::Global.instance.config.terminal
       if not_empty?(term)
-        puts cmd
+        notice "Command to run in new terminal app: #{cmd}"
         #tf = Tempfile.new
         #File.open(tf,"w") do |f|
         #  f.write "#!/bin/sh"

data/lib/hitcher/gen_ops.rb

@@ -0,0 +1,20 @@
+
+require 'toolrack'
+require 'colorize'
+
+require_relative 'user_prompt'
+
+module Hitcher
+  module CliOps
+    module GenOps
+      include Antrapol::ToolRack::ConditionUtils
+      include Hitcher::UserPrompt
+
+      def generate_scripts(inst)
+        inst.gen 
+        puts "\nSample shell scripts generated at '#{Dir.getwd}'\n\n".yellow
+      end
+      
+    end
+  end
+end

data/lib/hitcher/providers/docker/command_builder.rb

@@ -80,7 +80,7 @@ module Hitcher
         ccmd
       end # build_image
 
-      def cb_create_container_from_image(image, opts = { interactive: true })
+      def cb_create_container_from_image(image, opts = { })
         cmd = []
         cmd << docker_exe
         cmd << "run"

data/lib/hitcher/providers/docker/dsl.rb

@@ -1,4 +1,5 @@
 
+require "toolrack"
 require_relative 'template'
 require_relative 'command_builder'
 require_relative 'command_runner'
@@ -115,7 +116,8 @@ module Hitcher
     ## Module Dsl
     ##
     module Dsl
-     
+      include Antrapol::ToolRack::ConditionUtils
+
       attr_reader :image, :cName, :df, :mounts, :exposes, :interactive_mode, :tty_mode
 
       def image_name(name)
@@ -189,27 +191,49 @@ module Hitcher
       # 
       # Operation
       #
-      def gen
+      def gen(depth = :all)
         @logger.debug "Generate output files!"
         
         te = Hitcher::Docker::TemplateEngine.new
 
-        if not @dockerfile.nil?
+        if depth == :dockerfile or depth == :all and not @dockerfile.nil?
           te.build_template(:dockerfile, { image: @image, dockerfile: @df.cont  })
           @logger.debug "Dockerfile generated"
         end
 
-        te.build_template(:build_container, { image_name: @image })
+        if depth == :build_container or depth == :all
+          te.build_template(:build_container, { image_name: @image })
+        end
+
+        if depth == :run_script or depth == :all
+          # run script
+          mm = @mounts.collect { |m| m.hashify }
+          pp = @exposes.collect { |po| po.hashify }
+          params = { mounts: mm, ports: pp, container_name: @cName, image: @image }
+          params[:interactive] = @interactive_mode if not_empty?(@interactive_mode)
+          params[:tty] = @tty_mode if not_empty?(@tty_mode)
+          te.build_template(:run_container, params)
+          @logger.debug "run_container generated"
+        end
 
-        # run script
-        mm = @mounts.collect { |m| m.hashify }
-        pp = @exposes.collect { |po| po.hashify }
-        te.build_template(:run_container, { mounts: mm, ports: pp, container_name: @cName, interactive: true, image: @image  })
-        @logger.debug "run_container generated"
+        if depth == :start_container or depth == :all
+          params = { container_name: @cName }
+          params[:interactive] = @interactive_mode if not_empty?(@interactive_mode)
+          params[:tty] = @tty_mode if not_empty?(@tty_mode)
+          te.build_template(:start_container, params)
+          @logger.debug "start_container generated"
+        end
+
+        if depth == :container_prompt or depth == :all
+          params = { container_name: @cName }
+          params[:interactive] = @interactive_mode if not_empty?(@interactive_mode)
+          params[:tty] = @tty_mode if not_empty?(@tty_mode)
+          te.build_template(:container_prompt, params)
+          @logger.debug "container_prompt generated"
+        end
 
-        te.build_template(:start_container, { container_name: @cName, drop_to_prompt: true })
+        @logger.debug "Sample script generated successfully"
 
-        te.build_template(:container_prompt, { container_name: @cName })
 
       end # generate output files
 

data/lib/hitcher/providers/docker/template.rb

@@ -25,30 +25,41 @@ module Hitcher
               path = File.join(File.dirname(__FILE__),"templates","linux_mac","1.build.sh.erb")
               opts = {}
               opts.merge!(val)
-              cmd = build_image(opts[:image_name], opts)
-              bind_template(path,File.join(dest_root,"1.build.sh"), { command: cmd })
-
+              cmd = cb_build_image(opts[:image_name], opts)
+              f = File.join(dest_root,"1.build.sh")
+              bind_template(path,f, { command: cmd })
+              
+              FileUtils.chmod "+x", f
 
             when :run_container, :run
               path = File.join(File.dirname(__FILE__),"templates","linux_mac","2.run_container.sh.erb")
               opts = {}
               opts.merge!(val)
-              cmd = run_container_from_image(opts[:image], opts)
-              bind_template(path,File.join(dest_root,"2.run_container.sh"), { command: cmd })
+              cmd = cb_create_container_from_image(opts[:image], opts)
+              f = File.join(dest_root,"2.run_container.sh")
+              bind_template(path,f, { command: cmd })
+
+              FileUtils.chmod "+x", f
 
             when :start_container, :start
               path = File.join(File.dirname(__FILE__),"templates","linux_mac","3.start_container.sh.erb")
               opts = {}
               opts.merge!(val)
-              cmd = start_container(opts[:container_name], opts)
-              bind_template(path,File.join(dest_root,"3.start_container.sh"), { command: cmd })
+              cmd = cb_start_container(opts[:container_name], opts)
+              f = File.join(dest_root,"3.start_container.sh")
+              bind_template(path,f, { command: cmd })
+
+              FileUtils.chmod "+x", f
 
             when :container_prompt, :prompt
               path = File.join(File.dirname(__FILE__),"templates","linux_mac","4.container_prompt.sh.erb")
               opts = {}
               opts.merge!(val)
-              cmd = container_prompt(opts[:container_name], opts)
-              bind_template(path,File.join(dest_root,"4.container_prompt.sh"), { command: cmd })
+              cmd = cb_run_command_in_container(opts[:container_name], opts)
+              f = File.join(dest_root,"4.container_prompt.sh")
+              bind_template(path,f, { command: cmd })
+
+              FileUtils.chmod "+x", f
 
             end
           end

data/lib/hitcher/providers/docker/templates/linux_mac/1.build.sh.erb

@@ -1,5 +1,5 @@
 <%#-*- coding: utf-8 -*-%>
 #!/bin/sh
 
-# read Dockerfile and build
+# read Dockerfile and build the image
 <%= command %>

data/lib/hitcher/providers/docker/templates/linux_mac/3.start_container.sh.erb

@@ -1,6 +1,6 @@
 <%#-*- coding: utf-8 -*-%>
 #!/bin/sh
 
-# read start container
+# Start the container
 <%= command %>
 

data/lib/hitcher/version.rb

@@ -1,3 +1,3 @@
 module Hitcher
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Hitcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris Liaw
@@ -145,6 +145,7 @@ files:
 - lib/hitcher/command_runner.rb
 - lib/hitcher/config.rb
 - lib/hitcher/dsl.rb
+- lib/hitcher/gen_ops.rb
 - lib/hitcher/global.rb
 - lib/hitcher/providers/docker/command_builder.rb
 - lib/hitcher/providers/docker/command_runner.rb