takelage 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ebc0abb461626e44149fefb5c8c9fa8338156441b8cf539d9c15504290d5ee
-  data.tar.gz: f47e286a2c902ca8b9090288211c4789fd4dd2ee18279ceac54267d8e966e07d
+  metadata.gz: 27629dd8d5c67686cf07b09fa4d51e4293f230df5e534d3c8b9a7d0c6225713e
+  data.tar.gz: a44fcab58e4f2cc456e527eeee0adc8a8c2083ea7d010a94a1e01b7183ddda55
 SHA512:
-  metadata.gz: 53896cbd4d0ad86fed658beadffac639427e056ce844d6421f1a14037c9deed2c3ef056d265e9b538cace3f585f545b28d9776580b69817ee9a1cb366bf9da3a
-  data.tar.gz: b935291ad306a07378622589494800f115853ca18fedcf73165218fcef2f313a32cffea2d7a21d7339ebcf514b14d4ac0a014ed905e3e5b5c832055ab6968eb9
+  metadata.gz: 4d36a0ac626f26b58661d3f3122bcee12eabcadac144fb8b25ffc49c6ab0042381f9523c9ff4c4160444c69565d32bd14fd4c0d4c3ff7cf74a0f83a81ec6e294
+  data.tar.gz: 6410f138c0d2c934d3f76956db801ddd00c5845be5092b1dd1ff83f0d5c89e61062b88714909393bfda7bc1911170cf4913ef8e5e38605ff7472f500a375c75c

data/lib/takelage/bit/clipboard/cli.rb

@@ -27,7 +27,7 @@ module Takelage
     LONGDESC
     # Copy a file or directory as a bit component to a bit remote scope.
     def copy(dir_or_file, scope)
-      bit_clipboard_copy dir_or_file, scope
+      exit bit_clipboard_copy dir_or_file, scope
     end
 
     #
@@ -39,7 +39,7 @@ module Takelage
     LONGDESC
     # Paste a bit component into a directory.
     def paste(cid, dir)
-      bit_clipboard_paste cid, dir
+      exit bit_clipboard_paste cid, dir
     end
 
     #
@@ -51,7 +51,7 @@ module Takelage
     LONGDESC
     # Pull all updates for bit components from bit remote scopes.
     def pull
-      bit_clipboard_pull
+      exit bit_clipboard_pull
     end
 
     #
@@ -63,7 +63,7 @@ module Takelage
     LONGDESC
     # Push all updates of bit components to bit remote scopes.
     def push
-      bit_clipboard_push
+      exit bit_clipboard_push
     end
   end
 end

data/lib/takelage/bit/clipboard/module.rb

@@ -7,13 +7,13 @@ module BitClipboardModule
 
     unless bit_check_workspace
       log.error 'No bit workspace'
-      return
+      return false
     end
 
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
-        return
+        return false
       end
     end
 
@@ -35,7 +35,7 @@ module BitClipboardModule
 
         unless status.exitstatus.zero?
           log.error "No bit.dev remote scope \"#{scope}\" found"
-          return
+          return false
         end
 
       else
@@ -46,7 +46,7 @@ module BitClipboardModule
 
         unless /.*\s+#{scope}\s+.*/m.match? stdout_str
           log.error "No bit remote scope \"#{scope}\" found in local bit workspace"
-          return
+          return false
         end
       end
 
@@ -54,14 +54,14 @@ module BitClipboardModule
       Dir.glob("#{dir}/**/README.bit").each do |file|
         unless file == "#{dir}/README.bit"
           log.error "Nested README.bit file detected"
-          return
+          return false
         end
       end
 
       # touch README.bit if necessary
       readme_bit = "#{dir}/README.bit"
       unless File.file? readme_bit
-        log.warn "Creating \"README.bit\" in \"#{dir}\""
+        log.info "Creating \"README.bit\" in \"#{dir}\""
         File.open(readme_bit, 'w') {}
       end
 
@@ -77,7 +77,7 @@ module BitClipboardModule
       run cmd_bit_tag_id
     else
       log.error "The directory \"#{dir}\" does not exist"
-      return
+      return false
     end
 
     # export component to bit remote scope
@@ -89,6 +89,7 @@ module BitClipboardModule
     log.info "Copied directory \"#{dir}\" " +
                  "as bit component \"#{id}\" " +
                  "to bit remote scope \"#{scope}\""
+    true
   end
 
   # Backend method for bit paste.
@@ -97,16 +98,30 @@ module BitClipboardModule
 
     unless bit_check_workspace
       log.error 'No bit workspace'
-      return
+      return false
     end
 
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
-        return
+        return false
       end
     end
 
+    scope = cid.scan(/([^\/]*).*/).first.first
+
+    log.debug "Checking if scope \"#{scope}\" " +
+                  "has contains component id \"#{cid}\""
+
+    # get components in remote scope
+    cmd_bit_list_scope = config.active['bit_list_scope'] % {scope: scope}
+    bit_list_scope = run cmd_bit_list_scope
+
+    unless bit_list_scope.include? '"id": "' + cid + '",'
+      log.error "No remote scope \"#{scope}\""
+      return false
+    end
+
     # paste bit component into directory
     cmd_bit_import_cid = config.active['bit_import_cid'] % {cid: cid, dir: dir}
     run cmd_bit_import_cid
@@ -115,6 +130,7 @@ module BitClipboardModule
 
     log.info "Pasted bit component \"#{cid}\" " +
                  "to directory \"#{dir}\""
+    true
   end
 
   # Backend method for bit pull.
@@ -123,13 +139,13 @@ module BitClipboardModule
 
     unless bit_check_workspace
       log.error 'No bit workspace'
-      return
+      return false
     end
 
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
-        return
+        return false
       end
     end
 
@@ -144,6 +160,7 @@ module BitClipboardModule
     _remove_bit_artifacts
 
     log.info "Pulled bit components"
+    true
   end
 
   # Backend method for bit push
@@ -152,13 +169,13 @@ module BitClipboardModule
 
     unless bit_check_workspace
       log.error 'No bit workspace'
-      return
+      return false
     end
 
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
-        return
+        return false
       end
     end
 
@@ -173,6 +190,7 @@ module BitClipboardModule
     _remove_bit_artifacts
 
     log.info "Pushed bit components"
+    true
   end
 
   # Generate bit component ID.
@@ -203,6 +221,7 @@ module BitClipboardModule
   def _remove_bit_artifacts
     _remove_node_modules
     _remove_index_bit
+    _remove_package_json
   end
 
   # Remove node_modules directory.
@@ -216,4 +235,9 @@ module BitClipboardModule
       FileUtils.remove_entry_secure(file, force: true)
     end
   end
+
+  # Remove package.json file.
+  def _remove_package_json
+    FileUtils.remove_entry_secure('package.json', force: true)
+  end
 end

data/lib/takelage/bit/scope/cli.rb

@@ -21,8 +21,7 @@ module Takelage
     LONGDESC
     # Add bit remote scope.
     def add(scope)
-      exit false unless configured? %w(bit_ssh bit_remote)
-      bit_scope_add scope
+      exit bit_scope_add scope
     end
 
     #
@@ -37,8 +36,7 @@ module Takelage
     LONGDESC
     # Create new bit remote scope.
     def new(scope)
-      exit false unless configured? %w(bit_ssh bit_remote)
-      bit_scope_new scope
+      exit bit_scope_new scope
     end
 
     #
@@ -51,9 +49,10 @@ module Takelage
     LONGDESC
     # List bit remote scopes.
     def list
-      exit false unless configured? %w(bit_ssh bit_remote)
       scopes = bit_scope_list
+      exit false if scopes == false
       say scopes unless scopes.to_s.strip.empty?
+      true
     end
   end
 end

data/lib/takelage/bit/scope/module.rb

@@ -5,15 +5,17 @@ module BitScopeModule
   def bit_scope_add(scope)
     log.debug "Adding bit remote scope \"#{scope}\" to local workspace"
 
+    return false unless configured? %w(bit_ssh bit_remote)
+
     unless bit_check_workspace
       log.error 'No bit workspace'
-      return
+      return false
     end
 
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
-        return
+        return false
       end
     end
 
@@ -22,7 +24,7 @@ module BitScopeModule
     log.debug scope_list
     unless scope_list.include? scope
       log.error "The bit remote bit scope \"#{scope}\" doesn't exist"
-      exit false
+      return false
     end
 
     # get bit remote from active config
@@ -40,6 +42,8 @@ module BitScopeModule
   def bit_scope_list
     log.debug "Listing bit remote scopes"
 
+    return false unless configured? %w(bit_ssh bit_remote)
+
     # get ssh command from active config
     cmd_bit_ssh = config.active['bit_ssh']
 
@@ -64,11 +68,13 @@ module BitScopeModule
   def bit_scope_new(scope)
     log.debug "Creating new bit remote scope \"#{scope}\""
 
+    return false unless configured? %w(bit_ssh bit_remote)
+
     # check if bit remote scope already exists
     scope_list = bit_scope_list
     if scope_list.include? scope
       log.error "The remote bit scope \"#{scope}\" already exists"
-      exit false
+      return false
     end
 
     # get ssh command from active config

data/lib/takelage/completion/cli.rb

@@ -15,7 +15,10 @@ module Takelage
     LONGDESC
     # Print bash completion code.
     def bash
-      say Takelage::CLI.new.bash_fylla
+      completion_bash = Takelage::CLI.new.bash_fylla
+      exit false if completion_bash == false
+      say completion_bash
+      true
     end
   end
 end

data/lib/takelage/default.yml

@@ -7,7 +7,7 @@ bit_export_all: 'bit export --skip-update'
 bit_import_cid: 'bit import --ignore-package-json --skip-update -p %{dir} %{cid}'
 bit_import_all: 'bit import --skip-update --ignore-package-json -m manual'
 bit_list_remotes: 'bit remote --skip-update'
-bit_list_scope: 'bit list --skip-update --raw %{scope}'
+bit_list_scope: 'bit list --skip-update --json %{scope}'
 bit_remote: ''
 bit_repo: 'bit status'
 bit_scope_root: '/bit'

data/lib/takelage/docker/container/check/module.rb

@@ -6,7 +6,7 @@ module DockerContainerCheckModule
   def docker_container_check_existing(container)
     log.debug "Checking if container \"#{container}\" is existing"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
     cmd_docker_existing = 'docker ps ' +
         "--filter name=^#{container}$ " +
@@ -28,7 +28,7 @@ module DockerContainerCheckModule
   def docker_container_check_network(network)
     log.debug "Checking if network \"#{network}\" is existing"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
     cmd_docker_network = 'docker network ls ' +
         '--quiet ' +
@@ -50,7 +50,7 @@ module DockerContainerCheckModule
   def docker_container_check_orphaned(container)
     log.debug "Check if container \"#{container}\" is orphaned"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
     cmd_docker_orphaned = 'docker exec ' +
         '--interactive ' +

data/lib/takelage/docker/container/module.rb

@@ -5,9 +5,9 @@ module DockerContainerModule
   def docker_container_command(command)
     log.debug "Running command in container"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_repo docker_image docker_tag)
+    return false unless configured? %w(docker_repo docker_image docker_tag)
 
     docker_socket_start
 
@@ -20,9 +20,9 @@ module DockerContainerModule
   def docker_container_daemon
     log.debug 'Starting docker container as daemon'
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_repo docker_image docker_tag)
+    return false unless configured? %w(docker_repo docker_image docker_tag)
 
     _create_network @hostname unless docker_container_check_network @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
@@ -32,9 +32,9 @@ module DockerContainerModule
   def docker_container_login
     log.debug 'Logging in to docker container'
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_repo docker_image docker_tag)
+    return false unless configured? %w(docker_repo docker_image docker_tag)
 
     docker_socket_start
 
@@ -47,9 +47,9 @@ module DockerContainerModule
   def docker_container_nuke
     log.debug 'Removing all docker containers'
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_image)
+    return false unless configured? %w(docker_image)
 
     networks = []
 
@@ -68,9 +68,9 @@ module DockerContainerModule
   def docker_container_purge
     log.debug 'Removing orphaned docker containers'
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_image)
+    return false unless configured? %w(docker_image)
 
     networks = []
 
@@ -103,7 +103,7 @@ module DockerContainerModule
 
     unless docker_image_tag_check_local tag
       log.error "Image \"#{image}\" does not exist"
-      exit false
+      return false
     end
 
     entrypoint = '/entrypoint.py '

data/lib/takelage/docker/image/cli.rb

@@ -36,7 +36,7 @@ module Takelage
     LONGDESC
     # Get latest remote docker container.
     def update
-      docker_image_update
+      exit docker_image_update
     end
   end
 end

data/lib/takelage/docker/image/module.rb

@@ -3,15 +3,15 @@ module DockerImageModule
 
   # Backend method for docker image update.
   def docker_image_update
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_repo docker_image docker_tagsurl)
+    return false unless configured? %w(docker_repo docker_image docker_tagsurl)
 
     tag_latest_remote = docker_image_tag_latest_remote
 
     if tag_latest_remote.to_s.strip.empty?
       log.error "Unable to get latest remote tag"
-      exit false
+      return false
     end
 
     tag_latest_local = docker_image_tag_latest_local
@@ -19,14 +19,13 @@ module DockerImageModule
     unless tag_latest_local.to_s.strip.empty?
       if Gem::Version.new(tag_latest_local) >= Gem::Version.new(tag_latest_remote)
         log.info 'Already up to date.'
-        exit
+        return false
       end
     end
 
-    cmd_docker_pull_latest = "docker pull #{@docker_repo}/#{@docker_image}:#{tag_latest_remote}"
-
     log.info "Updating to docker image \"#{@docker_repo}/#{@docker_image}:#{tag_latest_remote}\""
 
+    cmd_docker_pull_latest = "docker pull #{@docker_repo}/#{@docker_image}:#{tag_latest_remote}"
     run_and_exit cmd_docker_pull_latest
   end
 end

data/lib/takelage/docker/image/tag/check/module.rb

@@ -6,9 +6,9 @@ module DockerImageTagCheckModule
   def docker_image_tag_check_local(tag)
     log.debug "Check if local docker image tag \"#{tag}\" exists"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_repo docker_image)
+    return false unless configured? %w(docker_repo docker_image)
 
     if tag.to_s.strip.empty?
       log.warn "No local docker image tag specified"
@@ -36,9 +36,9 @@ module DockerImageTagCheckModule
   def docker_image_tag_check_remote(tag)
     log.debug "Check if remote image tag \"#{tag}\" exists"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
-    exit false unless configured? %w(docker_repo docker_image docker_tagsurl)
+    return false unless configured? %w(docker_repo docker_image docker_tagsurl)
 
     if tag .to_s.strip.empty?
       log.warn "No remote docker image tag specified"

data/lib/takelage/docker/image/tag/latest/cli.rb

@@ -31,7 +31,10 @@ module Takelage
     LONGDESC
     # Print latest local docker image tag.
     def local
-      say docker_image_tag_latest_local
+      tag_latest_local = docker_image_tag_latest_local
+      exit false if tag_latest_local == false
+      say tag_latest_local
+      true
     end
 
     #
@@ -44,7 +47,10 @@ module Takelage
     LONGDESC
     # Print latest remote docker image tag.
     def remote
-      say docker_image_tag_latest_remote
+      tag_latest_remote = docker_image_tag_latest_remote
+      exit false if tag_latest_remote == false
+      say tag_latest_remote
+      true
     end
   end
 end

data/lib/takelage/docker/image/tag/latest/module.rb

@@ -6,7 +6,7 @@ module DockerImageTagLatestModule
   def docker_image_tag_latest_local
     log.debug "Getting latest local docker image tag"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
     tags = docker_image_tag_list_local
 
@@ -22,12 +22,12 @@ module DockerImageTagLatestModule
   def docker_image_tag_latest_remote
     log.debug "Getting latest remote docker image tag"
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
     tags = docker_image_tag_list_remote
 
     if tags.nil?
-      log.debug "No latest docker remote tag"
+      log.warn "No latest docker remote tag"
       return ''
     end
 

data/lib/takelage/docker/image/tag/list/cli.rb

@@ -29,7 +29,10 @@ module Takelage
     LONGDESC
     # Print local docker image tags.
     def local
-      say docker_image_tag_list_local
+      tag_list_local = docker_image_tag_list_local
+      exit false if tag_list_local == false
+      say tag_list_local
+      true
     end
 
     #
@@ -41,7 +44,10 @@ module Takelage
     LONGDESC
     # Print latest remote docker image tag.
     def remote
-      say docker_image_tag_list_remote
+      tag_list_remote = docker_image_tag_list_remote
+      exit false if tag_list_remote == false
+      say tag_list_remote
+      true
     end
   end
 end

data/lib/takelage/docker/image/tag/list/module.rb

@@ -26,18 +26,18 @@ module DockerImageTagListModule
       @res = Net::HTTP.get_response URI(@docker_tagsurl)
       unless @res.code.eql? '200'
         log.error "Unable to connect to \"#{@docker_tagsurl}\""
-        return
+        return false
       end
     rescue SocketError => e
       log.debug e
-      exit false
+      return false
     end
 
     begin
       tags = JSON.parse @res.body
     rescue JSON::ParserError
       log.error 'Unable to parse JSON'
-      exit false
+      return false
     end
 
     tags['tags'].sort_by(&Gem::Version.method(:new))

data/lib/takelage/docker/socket/cli.rb

@@ -44,7 +44,7 @@ module Takelage
     LONGDESC
     # Start sockets for docker container.
     def start
-      docker_socket_start
+      exit docker_socket_start
     end
 
     #
@@ -56,7 +56,7 @@ module Takelage
     LONGDESC
     # Stop sockets for docker container.
     def stop
-      docker_socket_stop
+      exit docker_socket_stop
     end
   end
 end

data/lib/takelage/docker/socket/module.rb

@@ -5,7 +5,7 @@ module DockerSocketModule
   def docker_socket_start
     log.debug 'Starting sockets for docker container'
 
-    exit false unless docker_check_running
+    return false unless docker_check_running
 
     cmds_start_socket = _get_socket_start_commands sockets_up = false
 
@@ -13,25 +13,25 @@ module DockerSocketModule
       log.debug 'Request sudo so that subsequent background tasks run without delay'
 
       cmd_sudo_true = config.active['sudo_true']
-
       run cmd_sudo_true
     end
 
     cmds_start_socket.each do |cmd_start_socket|
       run_and_fork cmd_start_socket
     end
+
+    true
   end
 
   # Backend method for docker socket stop.
   def docker_socket_stop
     log.debug 'Stopping sockets for docker container'
 
-    exit false unless docker_check_running
-
-    cmd_ps = config.active['docker_socket_ps']
+    return false unless docker_check_running
 
     # get process list
     # assuming format: "pid command"
+    cmd_ps = config.active['docker_socket_ps']
     stdout_str = run cmd_ps
 
     cmds_start_socket = _get_socket_start_commands sockets_up = true
@@ -51,11 +51,12 @@ module DockerSocketModule
           log.debug "Killing PID #{pid}"
 
           cmd_kill = config.active['docker_socket_kill'] % {pid: pid}
-
           run cmd_kill
         end
       end
     end
+
+    true
   end
 
   # get socket start commands

data/lib/takelage/info/project/cli.rb

@@ -17,7 +17,10 @@ module Takelage
     LONGDESC
     # Print active project info.
     def active
-      say hash_to_yaml(project.active)
+      project_active_yaml = hash_to_yaml(project.active)
+      exit false if project_active_yaml == false
+      say project_active_yaml
+      true
     end
 
     #
@@ -29,7 +32,10 @@ module Takelage
     LONGDESC
     # Print private project info.
     def private
-      say hash_to_yaml(project.private)
+      project_private_yaml = hash_to_yaml(project.private)
+      exit false if project_private_yaml == false
+      say project_private_yaml
+      true
     end
 
     #
@@ -41,7 +47,10 @@ module Takelage
     LONGDESC
     # Print main project info.
     def main
-      say hash_to_yaml(project.main)
+      project_main_yaml = hash_to_yaml(project.main)
+      exit false if project_main_yaml == false
+      say project_main_yaml
+      true
     end
   end
 end

data/lib/takelage/self/cli.rb

@@ -21,7 +21,10 @@ module Takelage
     LONGDESC
     # List all commands.
     def list
-      self_list
+      list = self_list
+      exit false if list == false
+      say list
+      true
     end
 
     #
@@ -31,10 +34,10 @@ module Takelage
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print takelage semantic version number
     LONGDESC
-    #Print takelage semantic version number.
-    # @return [String] semantic version number
+    # Print takelage semantic version number.
     def version
       say VERSION
+      true
     end
   end
 end

data/lib/takelage/self/config/cli.rb

@@ -22,7 +22,10 @@ module Takelage
     LONGDESC
     # Print takelage default configuration.
     def default
-      say hash_to_yaml(config.default)
+      config_default_yaml = hash_to_yaml(config.default)
+      exit false if config_default_yaml == false
+      say config_default_yaml
+      true
     end
 
     #
@@ -36,7 +39,10 @@ module Takelage
     LONGDESC
     # Print takelage home config file configuration.
     def home
-      say hash_to_yaml(config.home)
+      config_home_yaml = hash_to_yaml(config.home)
+      exit false if config_home_yaml == false
+      say config_home_yaml
+      true
     end
 
     #
@@ -50,7 +56,10 @@ module Takelage
     LONGDESC
     # Print takelage home config file configuration.
     def project
-      say hash_to_yaml(config.project)
+      config_project_yaml = hash_to_yaml(config.project)
+      exit false if config_project_yaml == false
+      say config_project_yaml
+      true
     end
 
     #
@@ -64,7 +73,10 @@ module Takelage
     LONGDESC
     # Print active takelage configuration.
     def active
-      say hash_to_yaml(config.active)
+      config_active_yaml = hash_to_yaml(config.active)
+      exit false if config_active_yaml == false
+      say config_active_yaml
+      true
     end
   end
 end

data/lib/takelage/self/module.rb

@@ -21,6 +21,6 @@ module SelfModule
     thor_list.gsub! /(.*)takelage:c_l_i:(.*)#(.*)/, '\1\2               #\3'
     thor_list.gsub! /.*COMMAND.*\n/, ''
 
-    say thor_list
+    thor_list
   end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.5.1
+0.6.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Geospin