dockerun 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56f73dfb5c9d69bf40fc5390cf7f97fe1d372741876849c93f18c736c4cfd74
-  data.tar.gz: 9a04ddab0fd5c33068f5d94d91a38cae34662b00efe41ec3d5dbb64d9050b5ff
+  metadata.gz: d0a6fc97935e5777962a76188ad3a39923ce84b9363c494c7a59c37d6888baff
+  data.tar.gz: db4d15767b81528d7d0c208bb8d7924e5e11d84aed610e0ccf037cfb39f2c6b5
 SHA512:
-  metadata.gz: 67558d361248855d989b111878b00f43f6180b04bfb2f541b1491f8fb67e281c13e66398d5d9005a9ecd27710ce2353bea650555c40d6c5c96aa136b521db69a
-  data.tar.gz: cdf8d67ba8487b7b6425387c10cf444885f1729230559de48033f9182d330ee1a7b14e570feb33550e7efe209ab00e436365b46b145323cc3b45bfde5062ef0a
+  metadata.gz: 6166715ddc5e72fa1f319563ef03a3472ce561e2e72000c73336196a06a59a08b2e6c7fb37fb9567bb58a374dc72ea8f16c49816b4040dfb148c2b924c47393e
+  data.tar.gz: 01df6c0dfa95436c1439f6870bdba7cc942f600c44e75ff16b63682a10cd7cd081ff399b603f0cb163fc31ff95c90e4fd95139bc47babb6498eb08b6ffdb58a2

data/README.md

@@ -1,24 +1,20 @@
 # Dockerun
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dockerun`. To experiment with that code, run `bin/console` for an interactive prompt.
+TODO: Delete this and the text below, and describe your gem
 
-TODO: Delete this and the text above, and describe your gem
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dockerun`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'dockerun'
-```
+TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
 
-And then execute:
+Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle install
+    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
 
-Or install it yourself as:
+If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install dockerun
+    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
 
 ## Usage
 

data/Rakefile

@@ -3,8 +3,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-require 'devops_assist'
-
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/Rakefile.bak

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/dockerspec.sample

@@ -0,0 +1,104 @@
+
+# 
+# Here is the sample that stipulate fields that can be set
+#
+# Config section is shared across by Dockerfile and docker cli
+config do
+  # this et the workdir inside the docker
+  # - Used by Dockerfile to set the default dir upon startup
+  # - Optionally used by docker cli to mount the development gem
+  #   directory into the parent of the workdir
+  #   Default to "/opt" if not given
+  #set_workdir "/opt/dockerun"
+
+  # determine apt-get or dnf or other
+  set_platform :debian
+
+  # Create user and group same as local user and group
+  # so the files created on mounted volume is same level
+  # as current running user
+  set_current_user
+
+  # Additional context for dockerun to consider
+  # Here is set to Rubygems context
+  # For example can bundle link the development gems
+  # into docker without user configuration, all from
+  # Gemfile of the Rubygems project
+  #activate_context :rubygems do 
+  #  duplicate_dev_env  
+  #  keep_gen_file
+  #end
+
+  # trigger dry run whereby:
+  # 1. Dockerfile shall be generated
+  # 2. All docker command shall be printed out
+  # Docker image is not built and container is not created
+  #dry_run
+
+
+end
+
+# This section is for Dockerfile entry
+# and also during docker build operation
+from "ruby:3.2.1" do
+
+  # keep the generated dockerfile
+  # Default is true. Can disable by :
+  # keep_dockerfile false
+  keep_dockerfile
+
+  # Docker image name
+  # Shall be used during building of docker image
+  # Shall be referred for operations such as if
+  # image already exist
+  # If not given shall default to dir_name+"_docker_image"
+  #set_image_name "dockerun-image"
+
+  # apt-get update && apt-get -y upgrade is on by default
+  # Can ask to skip update and upgrade by follwing:
+  #skip_update
+  #skip_upgrade
+
+  # List of software to install on the image
+  install "git", "curl"
+
+  # Transfer the workdir from config into Dockerfile
+  set_workdir
+
+  # set CMD of the Dockerfile
+  set_command "/bin/bash"
+end
+
+# section here shall generate docker command line:
+# docker run -it ... ... 
+up do 
+
+  # Container name to be refer later
+  # If not given shall be default to dir_name+"_cont_name"
+  #set_container_name "dockerun-container"
+
+  # keep the generated container so can be reuse
+  # next time
+  # Can be disable by : keep false
+  keep 
+
+  # Interactive session for the container
+  # Can be disable by : interactive false
+  interactive 
+
+  #mount "/opt/smtg" => "/opt/smtg"
+  # Mount directory into the docker container
+  mount current_dir: workdir
+
+  # Command to be run in docker
+  #run_in_docker "/bin/bash"
+
+  # Map port of docker to host
+  #port 3080 => 3000
+end
+
+# Entry point to ask the engine start operation
+# No needed for scripted operation
+#go
+
+

data/{dockerun.gemspec → dockerun.gemspec.bak}

@@ -3,15 +3,15 @@
 require_relative "lib/dockerun/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "dockerun"
-  spec.version       = Dockerun::VERSION
-  spec.authors       = ["Ian"]
-  spec.email         = ["cameronian0@protonmail.com"]
+  spec.name = "dockerun"
+  spec.version = Dockerun::VERSION
+  spec.authors = ["Chris"]
+  spec.email = ["chris@antrapol.com"]
 
-  spec.summary       = ""
-  spec.description   = ""
-  spec.homepage      = ""
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.summary = ""
+  spec.description = ""
+  spec.homepage = ""
+  spec.required_ruby_version = ">= 2.6.0"
 
   #spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
@@ -21,30 +21,28 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+  spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor Gemfile])
     end
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'toolrack' #, '> 0.19.1'
-  spec.add_dependency 'teLogger' #, '> 0.2.0'
+  spec.add_dependency "teLogger", "~> 0.2"
+  #spec.add_dependency "toolrack"
 
-  spec.add_dependency 'tty-command' #, "> 0.10.1"
-  spec.add_dependency 'tty-option' #, "> 0.2.0"
+  spec.add_dependency 'tty-prompt'
+  spec.add_dependency 'tty-command'
+  spec.add_dependency 'tty-which'
+  spec.add_dependency 'pastel'
   spec.add_dependency 'colorize'
 
-  spec.add_dependency 'docker-cli', ">= 0.3.1"
-
-  spec.add_development_dependency 'devops_assist'
-
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 
-  # For more information and examples about making a new gem, checkout our
+  # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
-  spec.add_development_dependency 'release-gem'
 end

data/exe/dockerun

@@ -1,121 +1,14 @@
 #!/usr/bin/env ruby
 
-#require 'bundler/setup'
-require 'toolrack'
-include TR::CondUtils
-
-require 'tty/prompt'
 require_relative '../lib/dockerun'
 
-if ARGV.length == 0
-  puts "dockerun version #{Dockerun::VERSION}"
-  puts Dockerun::Command::Dockerun.new.help
-
-else
-  pmt = TTY::Prompt.new
-
-  cmd = Dockerun::Command::Dockerun.new 
-  res = cmd.parse(ARGV).params.to_h
-  case res[:command].downcase
-  when "init"
-    initCmd = Dockerun::Command::Init.new
-    argv = ARGV[1..-1]
-    begin
-      res2 = initCmd.parse(argv).run do |ops, val|
-        case ops
-        when :multiple_templates_detected
-          pmt.select("There are multiple templates available. Please select one of the template : ") do |m|
-            val.each do |v|
-              m.choice v, v
-            end
-          end
-
-        when :prompt_user_configurables
-          pmt.say "\n The following are the configurable items for the template '#{val[:template]}' : \n", color: :yellow
-          res = {  }
-          val[:userFields].each do |k,v|
-            res[k] = pmt.ask("#{k.to_s.capitalize} : ") do |s|
-              s.required v[:required]  if not_empty?(v[:required]) and is_bool?(v[:required])
-              s.value v[:default].to_s if not_empty?(v[:default])
-            end
-          end
-          res
-        end
-      end
-
-      STDOUT.puts "\nDockerfile written to '#{res2}'\n\n"
-    rescue TTY::Reader::InputInterrupt
-      pmt.say "\n\n Aborted\n", color: :yellow
-    end
-
-  when "run", "r"
-
-    begin
-      runCmd = Dockerun::Command::Run.new
-      argv = ARGV[1..-1]
-      runCmd.parse(argv).run
-    rescue TTY::Reader::InputInterrupt
-      pmt.say "\n\n Aborted\n", color: :yellow
-    end
-
-
-  when "run-new-container", "rnc"
-
-    begin
-      runCmd = Dockerun::Command::RunNewContainer.new
-      argv = ARGV[1..-1]
-      runCmd.parse(argv).run
-    rescue TTY::Reader::InputInterrupt
-      pmt.say "\n\n Aborted\n", color: :yellow
-    end
-
-
-  when "run-new-image", "rni"
-
-    begin
-      runCmd = Dockerun::Command::RunNewImage.new
-      argv = ARGV[1..-1]
-      runCmd.parse(argv).run
-    rescue TTY::Reader::InputInterrupt
-      pmt.say "\n\n Aborted\n", color: :yellow
-    end
-
-  when "stop", "s"
-
-    begin
-      runCmd = Dockerun::Command::StopContainer.new
-      argv = ARGV[1..-1]
-      runCmd.parse(argv).run
-    rescue TTY::Reader::InputInterrupt
-    end
-
-
-
-
-  when "rmi", "remove-image"
-    begin
-      riCmd = Dockerun::Command::ResetImage.new
-      argv = ARGV[1..-1]
-      riCmd.parse(argv).run
-    rescue TTY::Reader::InputInterrupt
-      pmt.say "\n\n Aborted\n", color: :yellow
-    end
-
-
-  when "remove-container","rmc"
-    # remove container
-    begin
-      riCmd = Dockerun::Command::RemoveContainer.new
-      argv = ARGV[1..-1]
-      riCmd.parse(argv).run
-    rescue TTY::Reader::InputInterrupt
-      pmt.say "\n\n Aborted\n", color: :yellow
-    end
-
+# Operations
+# 1. [i]nit - Copy sample spec into project dir
+# 2. [r]un - Run the spec (default without params)
+# 3. [d]elete [c]ontainer - Delete container (using image name inside spec)
+# 4. [d]elete [i]mage - Delete image (Using container name inside spec)
+# 5. reset - Delete container and image
 
-  else
-    STDERR.puts "Unknown command '#{res[:command]}'"
-    STDOUT.puts cmd.help
-  end
-end
+cli = Dockerun::CliEngine.new
+cli.parse_argv(ARGV)
 

data/lib/dockerun/cli/command.rb

@@ -0,0 +1,133 @@
+
+require 'tty/command'
+require 'tty/prompt'
+require 'tty/which'
+
+require 'toolrack'
+
+require_relative 'command_result'
+
+module Dockerun
+  module Cli
+    class Command
+      include TR::CondUtils
+
+      class CommandError < StandardError; end
+
+      attr_accessor :command_buffer
+      def initialize(cmd, required_interaction = false)
+        
+        cmdOut = ENV["DOCKERUN_COMMAND_OUT"]
+        if not_empty?(cmdOut)
+          @runner = TTY::Command.new(printer: cmdOut.to_sym)
+        else
+          @runner = TTY::Command.new(printer: :null)
+        end
+
+        #@runner = TTY::Command.new
+        @command_buffer = cmd
+        @required_interaction = required_interaction
+        @required_interaction = false if not_bool?(@required_interaction)
+      end
+
+      def interactive_session?
+        @required_interaction
+      end
+
+      def run(&block)
+
+        if interactive_session?
+          
+          pmt = TTY::Prompt.new
+          terminal = pmt.select " Command is an interactive command. New terminal session is required. Please select one of the session below to proceed:" do |m|
+            detect_terminal.each do |t|
+              m.choice t, t
+            end
+
+            m.choice "Quit", :quit
+          end
+
+          if terminal != :quit
+            case terminal
+            when "terminator"
+              `#{terminal} -e "#{@command_buffer.join(" ")}; bash"`
+            when "gnome-terminal"
+              `#{terminal} -- bash -c "#{@command_buffer.join(" ")}; exec bash"`
+            when "konsole"
+              `#{terminal} --hold -e "#{@command_buffer.join(" ")}" &`
+            when "iTerm2"
+              `osascript -e \
+               'tell application "iTerm"
+               activate
+
+               create window with default profile
+               delay 0.5
+
+               set currentWindow to current window
+
+               tell current session of currentWindow
+               write text "#{@command_buffer.join(" ")}"
+               end tell
+
+               end tell'
+              `
+            when "Terminal" 
+              `osascript -e \
+               'tell application "Terminal"
+               activate
+               do script "#{@command_buffer.join(" ")}"
+               end tell'
+              `
+            else
+              raise Error, "Unfinished supporting terminal : #{terminal}"
+            end
+
+            pmt.puts "\n Prompt running inside the Docker shall be opened in a new window\n\n"
+          end
+
+        else
+          @outStream = []
+          @errStream = []
+          result = @runner.run!(@command_buffer.join(" "))  do |out, err|
+            if block
+              block.call(:outstream, out)
+              block.call(:errstream, err)
+            else
+              @outStream << out if not_empty?(out)
+              @errStream << err if not_empty?(err)
+            end
+          end
+
+          CommandResult.new(result, @outStream, @errStream)
+          #{ outStream: @outStream, errStream: @errStream, result: @result }
+        end
+      end
+
+      def to_string
+        @command_buffer
+      end
+      def to_s
+        to_string.join(" ")
+      end
+
+      private
+      def detect_terminal
+        avail = []
+        if TR::RTUtils.on_linux?
+          #possible = [ "gnome-terminal","konsole","tilix", "terminator" ]
+          possible = [ "gnome-terminal", "terminator" ]
+          possible.each do |app|
+            avail << app if not TTY::Which.which(app).nil?
+          end
+        elsif TR::RTUtils.on_windows?
+          avail << "cmd.exe"
+        elsif TR::RTUtils.on_mac?
+          avail << "Terminal"
+          avail << "iTerm2"
+        end
+        avail
+      end
+
+    end
+  end
+end