dockerun 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6626fb24f14182ca40924b86c645115f4a18d14da1d48cfd9832fb85b7aebf47
-  data.tar.gz: 4a19edb06eb072198af2ee92db3a6aa7e3d086ce3057940530abd5379defcc54
+  metadata.gz: 74a44fad6328874a4a1fb7bbb2016251289612c04e13b33f0a379322f6fa6483
+  data.tar.gz: 21e4031445056b0a7bf6eed50b7f973aac2a2d11fc39cbdac9d024331551d049
 SHA512:
-  metadata.gz: 3e0f07f26555f30b7fa03ae2e17f84adb3a1430db7ce1d8ad6ae228e2604f896d00744ec7c56fc90294e07d1dfc115ee9782b6035975615d7383cb7d2a831334
-  data.tar.gz: d623e2f25169ee8a137c14b8aaeac5192f71f1e836b9740d3d93956e530338de854497ae752a1ea8105b92bf1c7f500b8d22353e3ff2308d55ca6e9fc3d2a182
+  metadata.gz: 582c0c2f22cf71e7d5f0b51a8dae93eca93bc86e0a5cc8e050ab6aca5402d35c5a7e4eaee144477f15c10498ab47b317610d8bc61565682413ed4f97fa713a33
+  data.tar.gz: 0441c11a017bedb1ccee6ba3f4497e9a24eeca22d519ac4c72e61cbdd5164b2a0dc4ea5b1aebaaea6a24873bfbc9856d94de023028303681a251bbaa88b1f2fa

data/.release_history.yml

@@ -28,3 +28,5 @@ dockerun:
   :timestamp: 1670640902.591357
 - :version: 0.1.13
   :timestamp: 1670649972.645625
+- :version: 0.1.14
+  :timestamp: 1670677180.3442845

data/Gemfile

@@ -9,5 +9,7 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
+#gem 'git_cli', git: "git_cli", branch: "master"
 #gem 'docker-cli', git: "docker-cli", branch: "master" 
 
+

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    dockerun (0.1.12)
-      docker-cli
+    dockerun (0.1.15)
+      colorize (~> 0.8.0)
+      docker-cli (~> 0.2.1)
       teLogger (~> 0.2.0)
-      toolrack (~> 0.19.1)
+      toolrack (~> 0.20.1)
       tty-command (~> 0.10.1)
       tty-option (~> 0.2.0)
 
@@ -12,7 +13,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     base58 (0.2.3)
-    devops_assist (0.3.1)
+    colorize (0.8.1)
+    devops_assist (0.3.3)
       git_cli
       git_cli_prompt
       gvcs
@@ -20,13 +22,13 @@ GEM
       toolrack
       tty-prompt
     diff-lcs (1.5.0)
-    docker-cli (0.1.1)
-      ptools
-      teLogger
-      toolrack
-      tty-command
-      tty-prompt
-    git_cli (0.10.0)
+    docker-cli (0.2.1)
+      ptools (~> 1.4.3)
+      teLogger (~> 0.2.2)
+      toolrack (~> 0.20.1)
+      tty-command (~> 0.10.1)
+      tty-prompt (~> 0.23.1)
+    git_cli (0.11.2)
       gvcs
       ptools (~> 1.4.0)
       teLogger
@@ -35,7 +37,7 @@ GEM
       teLogger
       toolrack
       tty-prompt
-    gvcs (0.1.0)
+    gvcs (0.1.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
@@ -44,17 +46,17 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
     teLogger (0.2.2)
-    toolrack (0.19.1)
+    toolrack (0.20.1)
       base58
     tty-color (0.6.0)
     tty-command (0.10.1)
@@ -72,7 +74,7 @@ GEM
     wisper (2.0.1)
 
 PLATFORMS
-  x86_64-linux
+  x86_64-darwin-21
 
 DEPENDENCIES
   devops_assist
@@ -81,4 +83,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.28
+   2.4.6

data/dockerun.gemspec

@@ -30,13 +30,14 @@ Gem::Specification.new do |spec|
   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 'toolrack', '~> 0.20.1'
   spec.add_dependency 'teLogger', '~> 0.2.0'
 
   spec.add_dependency 'tty-command', "~> 0.10.1"
   spec.add_dependency 'tty-option', "~> 0.2.0"
+  spec.add_dependency 'colorize', "~> 0.8.0"
 
-  spec.add_dependency 'docker-cli'
+  spec.add_dependency 'docker-cli', "~> 0.2.1"
 
   spec.add_development_dependency 'devops_assist'
 

data/exe/dockerun

@@ -58,6 +58,17 @@ else
     rescue TTY::Reader::InputInterrupt
     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

data/lib/dockerun/cli_prompt.rb

@@ -1,4 +1,5 @@
 
+require 'colorize'
 require 'tty/prompt'
 
 module Dockerun

data/lib/dockerun/command/dockerun.rb

@@ -14,7 +14,7 @@ module Dockerun
 
       argument :command do
         required
-        desc "Command for the dockerun operations. Supported: init, run (r), run-new-container (rnc), run-new-image (rni), remove-image (rmi), remove-container (rmc)"
+        desc "Command for the dockerun operations. Supported: init, run (r), stop (s), run-new-container (rnc), run-new-image (rni), remove-image (rmi), remove-container (rmc)"
       end
 
       def run

data/lib/dockerun/command/run.rb

@@ -16,6 +16,7 @@ module Dockerun
       include CommandHelper::DockerContainerHelper
       include DockerCommandFactoryHelper
       include CommandHelper::DockerImageHelper
+      include CliHelper::CliPrompt
 
       usage do
         program "dockerun"
@@ -105,20 +106,33 @@ module Dockerun
             case ops
             when :new_container_name
               cli.ask("Please provide a new container name : ", required: true)
+
             when :container_name_exist
               cli.yes?("Container name '#{args.first}' already exist. Proceed with existing?")
+
             when :volume_mapping_required?
-              cli.yes?("Is there any volume mapping required? ")
+              cli.say "\nCurrent configured mount point(s) : \n"
+              config.container_mount_points(imageName, selContName).each do |mp|
+                cli.say " * (Local) #{mp.keys[0]} ==> (Container) #{mp.values[0]}"
+              end
+              cli.yes?("\nIs there any volume mapping required? ")
+
+            when :existing_volume_mapping
+              config.container_mount_points(imageName, selContName)
+
             when :source_prompt
               cli.ask("Directory to share with docker : ", required: true)
+
             when :destination_prompt
               src = args.first
               srcDir = File.basename(src)
               cli.ask("Directory to show inside docker : ", required: true, value: "/opt/#{srcDir}")
             when :add_mount_to_container
               config.add_mount_to_container(imageName, *args)
+
             when :add_more_volume_mapping?
               cli.yes?("Add more volume mapping?")
+
             end
           end
 

data/lib/dockerun/command/stop_container.rb

@@ -0,0 +1,90 @@
+
+require_relative '../cli_prompt'
+require_relative '../config'
+require_relative '../docker_container_helper'
+
+module Dockerun
+  module Command
+    
+    class StopContainer
+
+      include TTY::Option
+      include TR::CondUtils
+      include CommandHelper::DockerContainerHelper
+      include DockerCommandFactoryHelper
+      include CliHelper::CliPrompt
+
+      usage do
+        program "dockerun"
+        command "stop"
+        desc "Stop a running container"
+      end
+
+      def run(&block)
+        if params[:help]
+          print help
+          exit(0)
+
+        else
+
+          # find history file
+          config = ::Dockerun::Config.from_storage
+
+          res = []
+          opts = []
+          config.image_names.each do |im|
+            config.container_names(im).each do |cn|
+              if is_container_exist?(cn)
+                if is_container_running?(cn)
+res << "#{im} : #{cn} (Running)"
+                  opts << cn
+                else
+                  res << "#{im} : #{cn} (Not Running)"
+                end
+              else
+                res << "#{im} : #{cn} (Not Exist)"
+              end
+            end
+          end 
+
+          if not opts.empty?
+            cli.puts "\n Running status of container(s) : ".yellow
+            res.sort.each do |r|
+              cli.puts " * #{r}".yellow
+            end
+
+            cli.puts
+            selConts = cli.multi_select("Please select which container to stop : ") do |m|
+              opts.each do |o|
+                m.choice o,o
+              end
+
+              m.choice "Abort", :quit
+            end
+
+            if selConts.include?(:quit)
+              cli.puts " * Abort was one of the selected option. Command aborted.".red
+            else
+              selConts.each do |sc|
+                begin
+                  stop_container(sc)
+                  cli.puts " Container '#{sc}' stopped successfully.".green
+                rescue DockerContainerStopFailed => ex
+                  cli.puts " Container '#{sc}' failed to be stopped".red
+                end
+              end
+            end
+
+          else
+            cli.say " * There is no container found to be running * ".yellow
+          end
+
+          cli.puts "\n Stop container command completed successfully \n\n".yellow
+
+        end
+      end
+
+    end
+
+  end
+end

data/lib/dockerun/config.rb

@@ -28,9 +28,9 @@ module Dockerun
 
     def initialize(configHash = {  }, configFileAvail = false)
       @config = configHash 
-      @images = @config[:images]
+      @images = @config[:images] || {  }
       @confFileAvail = configFileAvail
-      @images = {  } if @images.nil?
+      #@images = {  } if @images.nil?
     end
 
     def isConfigFileAvail?
@@ -74,8 +74,8 @@ module Dockerun
       @images[imageName][container][:mount] << mount
     end
 
-    def mount_of_container(container)
-      res = @containers[container]
+    def container_mount_points(imageName, container)
+      res = @images[imageName][container]
       if is_empty?(res) or is_empty?(res[:mount])
         []
       else

data/lib/dockerun/docker_command_factory_helper.rb

@@ -2,6 +2,10 @@
 require 'docker/cli'
 
 module Dockerun
+
+  # 
+  # Link to CommandFactory 
+  #
   module DockerCommandFactoryHelper
     
     def dcFact

data/lib/dockerun/docker_container_helper.rb

@@ -3,20 +3,28 @@ require_relative 'docker_command_factory_helper'
 
 module Dockerun
   module CommandHelper
+
+    # 
+    # Common functions for docker container management
+    #
     module DockerContainerHelper
       include DockerCommandFactoryHelper
 
       class DockerContainerBuildFailed < StandardError; end
       class DockerContainerStartFailed < StandardError; end
+      class DockerContainerStopFailed < StandardError; end
 
       def run_docker_container(image_name, container_name, &block)
      
         raise DockerContainerBuildFailed, "block is required" if not block
         raise DockerContainerBuildFailed, "Image name is required" if is_empty?(image_name)
 
+        Dockerun.udebug("Running image '#{image_name}', container '#{container_name}'")
+
         reuse = nil
 
         if is_empty?(container_name)
+          Dockerun.udebug "Container name empty. Creating new container"
           container_name = block.call(:new_container_name)
           loop do
             st, _ = is_container_exist?(container_name)
@@ -30,19 +38,23 @@ module Dockerun
           end
 
         else
-          st, _ = is_container_exist?(container_name)
-          if st
-            reuse = true
-          else
-            # if not found shall drop into the next block's else clause 
-          end
+          reuse, _ = is_container_exist?(container_name)
+          Dockerun.udebug "Container name not empty. Is container exist? : #{reuse}"
+          #if st
+          #  reuse = true
+          #else
+          #  # if not found shall drop into the next block's else clause 
+          #end
         end
 
         if reuse == true
-         
-          res = dcFact.find_running_container(container_name).run
-          if not res.failed? and res.is_out_stream_empty?
+        
+          Dockerun.udebug "Find out of container '#{container_name}' is running..." 
+          #res = dcFact.find_running_container(container_name).run
+          #if not res.failed? and res.is_out_stream_empty?
+          if not is_container_running?(container_name)
             # not running
+            Dockerun.udebug "Container '#{container_name}' does not seems to be running. Starting container."
             ress = dcFact.start_container(container_name).run
             raise DockerContainerStartFailed, "Failed to start container '#{container_name}'. Error was : #{ress.err_stream}" if ress.failed?
           end
@@ -56,8 +68,10 @@ module Dockerun
 
         else
 
+          Dockerun.udebug "Container '#{container_name}' doesn't exist. Proceed to create new container."
           reqVolMap = block.call(:volume_mapping_required?)
-          mount = []
+          mount = block.call(:existing_volume_mapping) || []
+          #mount = []
           if reqVolMap
 
             loop do
@@ -105,6 +119,20 @@ module Dockerun
 
       end
 
+      def is_container_running?(name)
+        if not_empty?(name)
+          res = dcFact.find_running_container(name).run
+          not res.failed? and not res.is_out_stream_empty?
+        else
+          false
+        end
+      end
+
+      def stop_container(name)
+        res = dcFact.stop_container(name).run
+        raise DockerContainerStopFailed, "Failed to stop docker container '#{name}'. Error was : #{res.err_stream}" if res.failed?
+      end
+
       
     end
   end

data/lib/dockerun/docker_image_helper.rb

@@ -4,6 +4,10 @@ require_relative 'docker_command_factory_helper'
 
 module Dockerun
   module CommandHelper
+
+    # 
+    # common functions for docker image management
+    #
     module DockerImageHelper
       include CliHelper::CliPrompt
       include DockerCommandFactoryHelper

data/lib/dockerun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dockerun
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/lib/dockerun.rb

@@ -12,6 +12,7 @@ require_relative 'dockerun/command/reset_image'
 require_relative 'dockerun/command/run_new_container'
 require_relative 'dockerun/command/remove_container'
 require_relative 'dockerun/command/run_new_image'
+require_relative 'dockerun/command/stop_container'
 
 require_relative 'dockerun/template/template_writer'
 require_relative 'dockerun/template/template_engine'
@@ -19,4 +20,21 @@ require_relative 'dockerun/template/template_engine'
 module Dockerun
   class Error < StandardError; end
   # Your code goes here...
+
+  def self.udebug(msg)
+    logger.tdebug(:dockerun, msg) if is_user_debug_on?
+  end
+
+  def self.logger
+    if @_logger.nil?
+      @_logger = TeLogger::Tlogger.new
+    end
+    @_logger
+  end
+
+  def self.is_user_debug_on?
+    val = ENV["DOCKERUN_DEBUG"]
+    (not val.nil? and val == "true")
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerun
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Ian
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-10 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: teLogger
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: docker-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: devops_assist
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,7 @@ files:
 - lib/dockerun/command/run.rb
 - lib/dockerun/command/run_new_container.rb
 - lib/dockerun/command/run_new_image.rb
+- lib/dockerun/command/stop_container.rb
 - lib/dockerun/config.rb
 - lib/dockerun/docker_command_factory_helper.rb
 - lib/dockerun/docker_container_helper.rb
@@ -139,7 +154,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []