docker-cli 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7205a4fd4da05244963a59b557b73f7390c33e6eccf7d8ceb151212aa55d341
-  data.tar.gz: 2dc373bbff72ffe31ad1f6e06b93acb5c89895d2f73cc72512b840ac6011f04a
+  metadata.gz: b57e16a6a9617b00bc439513345150ec7d4b7ae191bf5d7ecabae708cbd5c435
+  data.tar.gz: cf58a1a2c3ce07a9975a7d8aba046f6df537898cc66b7fbc239f5827cf901720
 SHA512:
-  metadata.gz: fdfe1f3ef79d0fc43cf62edde5ed4a25005b6f4c3a55d8c4386162699a23334b513d8c31f4b6ca94fa06f915a0c620e0f0d871026ef27be30fce4f1b5036ca80
-  data.tar.gz: ffc7eb6b0865efa24cf32cecfb7ae5804c691982d7e35ad63749ff7e13b07e9f5b391e8893d7da17eac0df2e3019dea952595a64bc33138f8cc8ab9e7e07597e
+  metadata.gz: 65d150f521c8d676ea965e47588b090e76d2b4bdc8370bbe371cbbbe4aaa488e9d1ddd7265a206a6fb18448d1096454f42302843b74abbacc25a0b43f1c968d2
+  data.tar.gz: 2a25de8c91618eb8878c20fe051ff11d27cdf2443fc8af581745e56da582c72ede1bede4fe75e3bccdf491edd386bf949acae7f471de7fa619caee3286dd9322

data/.release_history.yml

@@ -8,3 +8,7 @@ docker-cli:
   :timestamp: 1679547303.774784
 - :version: 0.2.1
   :timestamp: 1679551516.275535
+- :version: 0.3.0
+  :timestamp: 1680595365.491362
+- :version: 0.3.1
+  :timestamp: 1680595908.3088417

data/.rubocop.yml

@@ -0,0 +1,2 @@
+AllCops:
+  DisabledByDefault: true

data/Gemfile

@@ -9,7 +9,6 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-#gem 'toolrack', git: 'toolrack', branch: 'master'
 #
 #gem 'git_cli', git: "git_cli", branch: "master"
 #gem 'git_cli_prompt', git: "git_cli_prompt", branch: 'master'

data/Gemfile.lock

@@ -1,53 +1,50 @@
 PATH
   remote: .
   specs:
-    docker-cli (0.3.0)
+    docker-cli (0.5.0)
+      colorize
       ptools
       teLogger
-      toolrack
+      toolrack (= 0.24.1)
       tty-command
       tty-prompt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    devops_assist (0.3.11)
-      git_cli
-      git_cli_prompt (~> 0.3.3)
-      gvcs
-      teLogger
-      toolrack
-      tty-prompt
+    colorize (1.1.0)
     diff-lcs (1.5.0)
-    git_cli (0.11.2)
-      gvcs
+    git_cli (0.13.9)
       ptools (~> 1.4.0)
-      teLogger
-      toolrack
-    git_cli_prompt (0.3.4)
-      teLogger
-      toolrack
-      tty-prompt
-    gvcs (0.1.1)
+      teLogger (> 0.2)
+      toolrack (> 0.23)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
-    rake (13.0.6)
+    rake (13.1.0)
+    release-gem (0.3.3)
+      colorize (~> 1.1)
+      git_cli (~> 0.13)
+      pastel (~> 0.8)
+      teLogger (~> 0.2)
+      toolrack (~> 0.23)
+      tty-command (~> 0.10)
+      tty-prompt (~> 0.23)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     teLogger (0.2.2)
-    toolrack (0.21.0)
+    toolrack (0.24.1)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
@@ -59,7 +56,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     wisper (2.0.1)
 
 PLATFORMS
@@ -67,10 +64,10 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  devops_assist
   docker-cli!
   rake (~> 13.0)
+  release-gem
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.28
+   2.5.1

data/Rakefile

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

data/docker-cli.gemspec

@@ -30,19 +30,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'toolrack'
+  #spec.add_dependency 'toolrack'
   spec.add_dependency 'teLogger'
 
   spec.add_dependency 'ptools'
 
   spec.add_dependency 'tty-command'
+  spec.add_dependency 'colorize'
   spec.add_dependency 'tty-prompt'
 
-  spec.add_development_dependency 'devops_assist'
+  #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
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.add_development_dependency 'release-gem'
+  spec.add_dependency "toolrack", "0.24.1"
 end

data/exe/_gemdocker

@@ -0,0 +1,225 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/docker/cli'
+
+include TR::CondUtils
+
+pmt = TTY::Prompt.new
+
+root = Dir.getwd
+dockerfile = File.join(root, "Dockerfile")
+
+# Should spin off jruby:9.4.2.0-jdk and land on console
+# > gemdocker jruby:9.4.2.0-jdk
+# 
+
+
+again = true
+while again
+  if not File.exist?(dockerfile)
+    dockerfile = pmt.ask(" #{dockerfile} does not exist. Please provide new location of Dockerfile: ", required: true) 
+  else
+    again = false
+  end
+end
+
+
+cf = Docker::Cli::CommandFactory.new
+begin
+
+  existing = false
+  again = true
+  while again
+    dname = pmt.ask("Please provide name of image at local : ", required: true)
+    ficr = cf.find_image(dname)
+    if ficr.success?
+      if ficr.is_out_stream_empty?
+        again = false
+      else
+        reuse = pmt.yes?(" Given local image name '#{dname}' already taken. Use back the same image? 'No' to retry with new name : ")
+        if not reuse
+          again
+        else
+          existing = true
+        end
+      end
+    else
+      raise CommandFailed, "Failed to find Docker image. Error was : #{ficr.err_stream}"
+    end
+  end
+
+  if not existing 
+    cr = cf.build_image(dname, dockerfile: dockerfile).run
+    STDOUT.puts cr.out_stream if not cr.is_out_stream_empty?
+    raise CommandFailed, "Failed to build image with name '#{dname}' using dockerfile '#{dockerfile}'. Error was : #{cr.err_stream}"
+  end
+
+  reuse = false
+  again = true
+  while again
+    contName = pmt.ask(" Please provide a name for container : ", required: true)
+    ir = cf.find_from_all_container(contName)
+    if ir.successful?
+      if ir.is_out_stream_empty?
+        # not found
+        again = false
+      else
+        reuse = pmt.yes? "Given container name '#{contName}' already exist. Do you want to reuse the existing container? "
+        if reuse
+          
+          again = false
+        else
+
+          again = false
+        end
+      end
+    end
+  end
+
+  if reuse
+    rcf = cf.find_running_container(contName)
+    if rcf.successful?
+      if rcf.is_out_stream_empty?
+        # not found
+        scrv = cf.start_container(contName)
+        if not scrv.successful?
+          raise CommandFailed, "Failed to start container '#{contName}'. Error was : #{scrv.err_stream}"
+        end
+
+        ucmd = pmt.ask(" Command to be run inside the container. Empty to attach to existing session : ", value: "/bin/bash")
+        if is_empty?(ucmd)
+          cf.attach_container(contName).run
+        else
+          cf.run_command_in_running_container(contName, ucmd, tty: true, interactive: true).run
+        end
+
+      end
+    end
+
+  else
+
+    @workspace_root = "/opt"
+    @shared_dirs = {}
+
+    #@workspace_root = pmt.ask(" Where is the root of the workspace to be? : ", required: true, default: "/opt")
+
+    mount = []
+    res = find_local_dev_gems
+    if not res.empty?
+      
+      STDOUT.puts "Found #{res.length} development gems in the configuration"
+
+      res.each do |name, path|
+        proot = pmt.ask("Found development gem path '#{path}'. Where would you want to map the gem inside the Docker? ", required: true, default: @workspace_root)
+        dkPath = File.join(proot, path)
+        mount << { path => dkPath }
+        @shared_dirs[name] = tsrc 
+      end
+
+    end
+
+    mapProjectDir = pmt.ask(" Where do you want to map the current directory? Empty to skip mapping : ", default: @workspace_root)
+    if not_empty?(mapProjectDir)
+      mount << { Dir.getwd => mapProjectDir }
+    end
+
+    reqVolMap = block.call(:volume_mapping_required?)
+    if reqVolMap
+
+      loop do
+
+        block.call(:already_mapped, mount)
+
+        src = block.call(:source_prompt, { control: [ "Empty to end" ] })
+        if is_empty?(src)
+          block.call(:volume_mapping_skipped)
+          break
+        end
+
+        dest = block.call(:destination_prompt, src)
+        mount << { src => dest }
+
+        add_to_bundle = block.call(:add_to_bundle?, dest)
+        if add_to_bundle
+          @shared_dirs[File.basename(dest)] = dest
+        end
+
+        #repeat = block.call(:add_more_volume_mapping?)
+        #break if not repeat
+
+      end
+
+    end
+
+    @workspace_root = "/opt"
+    @shared_dirs = {}
+
+    block.call(:prompt_mount_points_starting)
+
+    mount = []
+    res = find_local_dev_gems
+    #puts "Found #{res.length} local gems #{res}"
+    if not res.empty?
+
+      transferMapping = block.call(:transfer_dev_gem_mapping?, res)
+      if transferMapping
+        res.each do |name, path|
+          loop do
+            if not File.exist?(path)
+              path = block.call(:dev_gem_path_not_found, path)
+            else
+              break
+            end
+          end
+          tsrc = block.call(:workspace_root_inside_docker, @workspace_root, name, path)
+          mount << { path => tsrc }
+          @shared_dirs[name] = tsrc 
+        end
+      end
+
+    end
+
+    mapProjectDir = block.call(:map_project_dir, @workspace_root)
+    if not_empty?(mapProjectDir)
+      mount << { Dir.getwd => mapProjectDir }
+    end
+
+    reqVolMap = block.call(:volume_mapping_required?)
+    if reqVolMap
+
+      loop do
+
+        block.call(:already_mapped, mount)
+
+        src = block.call(:source_prompt, { control: [ "Empty to end" ] })
+        if is_empty?(src)
+          block.call(:volume_mapping_skipped)
+          break
+        end
+
+        dest = block.call(:destination_prompt, src)
+        mount << { src => dest }
+
+        add_to_bundle = block.call(:add_to_bundle?, dest)
+        if add_to_bundle
+          @shared_dirs[File.basename(dest)] = dest
+        end
+
+        #repeat = block.call(:add_more_volume_mapping?)
+        #break if not repeat
+
+      end
+
+    end
+
+
+
+    nc = cf.create_container_from_image(dname, { interactive: true, tty: true, container_name: contName })
+
+  end
+
+
+rescue Exception => ex
+  STDERR.puts "\n Exception raised : #{ex.message} \n"
+end
+

data/exe/dc-update

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'tty/prompt'
+require 'colorize'
+
+require_relative '../lib/docker/cli'
+
+pmt = TTY::Prompt.new
+# dc-update docker-compose.yml.tmp docker-compose.yml
+begin
+  STDOUT.puts "\n Docker Cli version #{Docker::Cli::VERSION}".green
+  Docker::Cli::DockerComposer.new.parse_argv(ARGV) do |key, *val|
+    case key
+    when :prompt_docker_mount_root
+      pmt.ask(" Please provide the root to mount inside docker : ", required: true, default: '/opt')
+    end
+  end
+rescue TTY::Reader::InputInterrupt
+rescue ArgsParser::ArgParserException => ex
+  STDERR.puts ex.message.red
+end
+
+
+

data/exe/gemdocker

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'securerandom'
+require 'colorize'
+require_relative '../lib/docker/cli'
+
+require_relative '../lib/docker/cli/operations/args_parser'
+
+include TR::CondUtils
+include Docker::Cli
+
+begin
+  STDOUT.puts "\n Docker Cli version #{Docker::Cli::VERSION}".green
+  ArgsParser.new.parse_argv(ARGV)
+rescue TTY::Reader::InputInterrupt
+rescue ArgsParser::ArgsParserException => ex
+  STDERR.puts ex.message.red
+  #STDERR.puts ex.backtrace.join("\n")
+end
+
+#if ARGV.length > 0
+#  # 
+#  # Should spin off jruby:9.4.2.0-jdk and land on console
+#  # > gemdocker jruby:9.4.2.0-jdk
+#  # 
+#  dimage = ARGV.first
+#  cmd = ARGV[1] || "/bin/bash"
+#
+#  contName = SecureRandom.hex(8)
+#
+#  mountLocal = Dir.getwd
+#  mountDocker = "/opt/#{File.basename(Dir.getwd)}"
+#  # user & group created but cannot switch to the user
+#  # User creation and login cannot be on the same session
+#  #Docker::Cli::DockerContainer.prep_container(dimage, mount_local: mountLocal, mount_docker: mountDocker, container_name: contName,  mount: { mountLocal => mountDocker })
+#
+#  #cont = Docker::Cli::DockerContainer.new(contName)
+#  #cont.start if not cont.is_running?
+#  #cont.run_command(cmd, interactive: true, tty: true)
+#  #Docker::Cli::DockerContainer.create_container(dimage, interactive: true, tty: true, command: cmd, container_name: contName, mount: { mountLocal => mountDocker }, match_user: true)
+#
+#  # This approach has user match with local user but no name on the docker
+#  # workable not nice only
+#  Docker::Cli::DockerContainer.create_container(dimage, interactive: true, tty: true, command: cmd, mount: { mountLocal => mountDocker }, match_user: true)
+#
+#else
+#  # interactive
+#  puts "Interactive coming soon..."
+#end
+
+
+

data/exe/gemdocker_test

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'securerandom'
+require_relative '../lib/docker/cli'
+
+include TR::CondUtils
+
+
+if ARGV.length > 0
+  # 
+  # Should spin off jruby:9.4.2.0-jdk and land on console
+  # > gemdocker jruby:9.4.2.0-jdk
+  # 
+  dimage = ARGV.first
+  cmd = ARGV[1] || "/bin/bash"
+
+  contName = SecureRandom.hex(8)
+
+  mountLocal = Dir.getwd
+  mountDocker = "/opt/#{File.basename(Dir.getwd)}"
+  # user & group created but cannot switch to the user
+  # User creation and login cannot be on the same session
+  #Docker::Cli::DockerContainer.prep_container(dimage, mount_local: mountLocal, mount_docker: mountDocker, container_name: contName,  mount: { mountLocal => mountDocker })
+
+  #cont = Docker::Cli::DockerContainer.new(contName)
+  #cont.start if not cont.is_running?
+  #cont.run_command(cmd, interactive: true, tty: true)
+  #Docker::Cli::DockerContainer.create_container(dimage, interactive: true, tty: true, command: cmd, container_name: contName, mount: { mountLocal => mountDocker }, match_user: true)
+
+  # This approach has user match with local user but no name on the docker
+  # workable not nice only
+  Docker::Cli::DockerContainer.create_container(dimage, interactive: true, tty: true, command: cmd, mount: { mountLocal => mountDocker }, match_user: true)
+
+else
+  # interactive
+  puts "Interactive coming soon..."
+end
+
+
+

data/lib/docker/cli/command.rb

@@ -11,6 +11,9 @@ module Docker
   module Cli
     class Command
       include TR::CondUtils
+      include TR::TerminalUtils
+
+      class CommandError < StandardError; end
 
       attr_accessor :command_buffer
       def initialize(cmd, required_interaction = false)
@@ -38,37 +41,40 @@ module Docker
           end
 
           if terminal != :quit
-            case terminal
-            when "terminator"
-              `#{terminal} -x "#{@command_buffer.join(" ")}"`
-            when "gnome-terminal"
-              `#{terminal} -- bash -c "#{@command_buffer.join(" ")}; exec bash"`
-            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
+
+            tu_new_terminal(terminal, @command_buffer)
+
+            #case terminal
+            #when "terminator"
+            #  `#{terminal} -x "#{@command_buffer.join(" ")}"`
+            #when "gnome-terminal"
+            #  `#{terminal} -- bash -c "#{@command_buffer.join(" ")}; exec bash"`
+            #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