docker-cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273888f0efbab78c681cbba082b6bf402b8c546abf8a732d71827f238bfa51df
-  data.tar.gz: cc1cd3009140b977b4ffd7bbfa74920542ae2217f5d50b18eb5519310b06a9ea
+  metadata.gz: c3b534e3b0aa4cba19d8cce7c543f9af128e3186e3315cd2fc9efd4c44610e7e
+  data.tar.gz: 00ac6d7b9919d13b08d1dbf9fd460491abb35810f57bd032d1e18c41f1ab0b9e
 SHA512:
-  metadata.gz: e0a459e9c1fa225a93f53f957c558d537e2e3a1558f88cb04b95e1a723bf726e2cc3745fe27e6210a64179883624ab6ec5984ed55f55bd9b7ce9a69ee6832343
-  data.tar.gz: f37f25934d5584d271cbc6d529aab26a42d869c0911d670b7736aa8f144acecbd82cd6c548f3ec3de229c60c15e06eb9984d29c2f311a8f21a98b029931b4422
+  metadata.gz: 5f33fcfe8272f889b4d7c79921b562d969e0318ac76b0660085026ff09a784eabfa1b8cdff5929cffaa2bb771906ad8ca74d9d2996ffb9077bd0433563108249
+  data.tar.gz: 6342a7d84dc8bd713eac66c09823b41395adb9e1a4e82bad1c5f14c54f5c51762c77d0653c2a1bee9539dd526a6847b3d98613afc137188d99896cd31420f40b

data/Gemfile

@@ -8,3 +8,10 @@ gemspec
 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'
+gem 'devops_assist', git: "devops_assist", branch: "master"
+

data/Gemfile.lock

@@ -1,33 +1,59 @@
-PATH
-  remote: .
-  specs:
-    docker-cli (0.1.2)
-      ptools
-      teLogger
-      toolrack
-      tty-command
-      tty-prompt
-
-GEM
-  remote: https://rubygems.org/
+GIT
+  remote: devops_assist
+  revision: 7d0ed10bc1964532be810c347447ec9ee4a61fca
+  branch: master
   specs:
-    devops_assist (0.3.11)
+    devops_assist (0.3.3)
       git_cli
-      git_cli_prompt (~> 0.3.3)
+      git_cli_prompt
       gvcs
       teLogger
       toolrack
       tty-prompt
-    diff-lcs (1.5.0)
+
+GIT
+  remote: git_cli
+  revision: 05d83d28f37f4023920b6bf91d975b818d0f13fe
+  branch: master
+  specs:
     git_cli (0.11.2)
       gvcs
       ptools (~> 1.4.0)
       teLogger
       toolrack
-    git_cli_prompt (0.3.4)
+
+GIT
+  remote: git_cli_prompt
+  revision: b9734eab851922936515f717093b1e2429a24d8a
+  branch: master
+  specs:
+    git_cli_prompt (0.3.1)
       teLogger
       toolrack
       tty-prompt
+
+PATH
+  remote: .
+  specs:
+    docker-cli (0.2.0)
+      ptools
+      teLogger
+      tty-command
+      tty-prompt
+
+GIT
+  remote: toolrack
+  revision: be0bda340f7f6047e5ceace77b5d0a928bbcdecf
+  branch: master
+  specs:
+    toolrack (0.20.1)
+      base58
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    base58 (0.2.3)
+    diff-lcs (1.5.0)
     gvcs (0.1.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
@@ -42,12 +68,11 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    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.21.0)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
@@ -63,14 +88,16 @@ GEM
     wisper (2.0.1)
 
 PLATFORMS
-  ruby
-  x86_64-linux
+  x86_64-darwin-21
 
 DEPENDENCIES
-  devops_assist
+  devops_assist!
   docker-cli!
+  git_cli!
+  git_cli_prompt!
   rake (~> 13.0)
   rspec (~> 3.0)
+  toolrack!
 
 BUNDLED WITH
-   2.2.28
+   2.4.6

data/docker-cli.gemspec

@@ -30,7 +30,7 @@ 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'
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tty-command'
   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"

data/lib/docker/cli/command.rb

@@ -3,6 +3,8 @@ require 'tty/command'
 require 'tty/prompt'
 require 'ptools'
 
+require 'toolrack'
+
 require_relative 'command_result'
 
 module Docker
@@ -41,6 +43,30 @@ module Docker
               `#{terminal} -x "#{@command_buffer.join(" ")}"`
             when "gnome-terminal"
               `#{terminal} -- bash -c "#{@command_buffer.join(" ")}; exec bash"`
+            when "iTerm2"
+              `osascript <<EOL
+               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
+               EOL
+              `
+            when "Terminal" 
+              `osascript -e \
+               'tell application "Terminal"
+               activate
+               do script "#{@command_buffer.join(" ")}"
+               end tell'
+              `
             else
               raise Error, "Unfinished supporting terminal : #{terminal}"
             end
@@ -70,10 +96,17 @@ module Docker
 
       private
       def detect_terminal
-        possible = [ "gnome-terminal","konsole","cmd.exe", "tilix", "terminator" ]
         avail = []
-        possible.each do |app|
-          avail << app if not File.which(app).nil?
+        if TR::RTUtils.on_linux?
+          possible = [ "gnome-terminal","konsole","cmd.exe", "tilix", "terminator" ]
+          possible.each do |app|
+            avail << app if not File.which(app).nil?
+          end
+        elsif TR::RTUtils.on_windows?
+          avail << "cmd.exe"
+        elsif TR::RTUtils.on_mac?
+          avail << "Terminal"
+          avail << "iTerm2"
         end
         avail
       end

data/lib/docker/cli/command_factory.rb

@@ -93,14 +93,9 @@ module Docker
         cmd = []
         cmd << Cli.docker_exe
         cmd << "ps"
-        # return all info instead of only the container ID
-        #cmd << "-a"
         cmd << "-aq"
         cmd << "-f"
-        # From little testing seems the command by default already support regex formatting
-        # So can use the regex marker to get exact match
-        # e.g. if want exact match, pass in ^#{name}\z
-        cmd << "name=\"#{name}\""
+        cmd << "name=#{name}"
 
         logger.debug "Find from all container: #{cmd.join(" ")}"
         Command.new(cmd)
@@ -260,10 +255,6 @@ module Docker
         @logger
       end
 
-      def parse_container_list(out, &block)
-         
-      end
-
     end
   end
 end

data/lib/docker/cli/command_result.rb

@@ -1,4 +1,5 @@
 
+require 'toolrack'
 
 module Docker
 

data/lib/docker/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Docker
   module Cli
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/ruby-iterm2.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+PATH_AND_FILE=$1
+
+THE_PATH="${PATH_AND_FILE%/*}"
+FILENAME="${PATH_AND_FILE##*/}"
+echo "Script called"
+echo "PATH_AND_FILE=$PATH_AND_FILE"
+echo "THE_PATH=$THE_PATH"
+echo "FILENAME=$FILENAME"
+
+osascript <<EOF
+
+tell application "iTerm"
+  activate
+  
+  # Check to see if we have an open window. If not, open one.
+  if (count windows) is 0 then # no window is open. 
+    create window with default profile
+    delay 0.5
+  end if
+  
+  set currentWindow to current window # get a reference to current window
+  
+  # We have an open window. 
+  tell current session of currentWindow
+    if (is processing) or (name is not "bash") then # the current session is busy
+      tell currentWindow
+        create tab with default profile #- create a new tab
+        delay 0.5
+      end tell
+    end if
+  end tell
+  
+  tell current session of currentWindow
+    # make sure we're in the right directory
+    write text "cd '$THE_PATH'"
+    delay 0.5
+    
+    # run the script
+    set script_string to "$2" & " " & quoted form of "$FILENAME"
+    write text script_string
+    
+  end tell
+  
+end tell
+EOF

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: docker-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: toolrack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: teLogger
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: devops_assist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ''
 email:
 - cameronian0@protonmail.com
@@ -116,10 +88,11 @@ files:
 - lib/docker/cli/command_factory.rb
 - lib/docker/cli/command_result.rb
 - lib/docker/cli/version.rb
+- ruby-iterm2.sh
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []