takelage 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd909364c4dbb82c0c9e8ac1ba6ccfed67e51fe56794b7a6aa36af3ea86e6f2
-  data.tar.gz: b5343bcba1852c0d56ce454c5ff8ed6172220747087b13a0b24cd8c4748761aa
+  metadata.gz: cb5d74447dcfd62750e7edddf49a98b3a4a2565316b5e0fed13342ee6248d24d
+  data.tar.gz: 9c6ac4feb670f45dc5e728d7a92114020e7e69f8ac7b37ff158507d0d430cac0
 SHA512:
-  metadata.gz: 1565a6d13da908d8fae2f10bcd0e45264945559c32483d90952940a1225fd5c3643579a8f20e9ab3c6d9e0a4e10d2618c0d0e01a027049e8ffcf25b53c19667b
-  data.tar.gz: d395c04730066c07d2b288913b0353538305e03d5cda5717414f5475357a2b19a7e0286f5f85f3548d69d9ae1ee6d208d85ab63d1de2677643566594a5e782fc
+  metadata.gz: 1c2b09725d668cc8c54194dd856dc5ba8411074f6d5aadd935c1f04c8c9fa839cecd0941c270cb2454a54fc2dc0bad6b8d0798579ba3a440c67bf61e25567a95
+  data.tar.gz: 1ec42421048df41cc9ce2836ae3df0f19e7023e1ff779efc62e17828f41e888300d926baba3f84bc013c70f450a7c2f4f84227b927e2bfa1c9db312cad95790f

data/README.md

@@ -18,7 +18,7 @@ The takelage devops framework consists of these projects:
 | --- | ----------- |
 | *[takelage-dev](https://github.com/geospin-takelage/takelage-dev)* | takelage development environment |
 | *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | takelage command line interface |
-| *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | takelage [bit](https://github.com/teambit/bit) server | 
+| *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | takelage bit server | 
 
 ## Installation
 
@@ -57,6 +57,7 @@ tau purge | # Alias for tau [docker container purge](features/takelage/docker/do
 tau push | # Alias for tau [bit clipboard push](features/takelage/bit/bit.clipboard.push.feature)
 tau update | # Alias for tau [docker image update](features/takelage/docker/docker.image.update.feature)
 tau version | # Alias for tau [self version](features/takelage/self/self.version.feature)
+tau [bit check workspace](features/takelage/bit/bit.check.workspace.feature) | # Check if a bit workspace exists
 tau [bit clipboard copy](features/takelage/bit/bit.clipboard.copy.feature) [DIR] [SCOPE] | # Copy new [DIR] to [SCOPE]
 tau [bit clipboard paste](features/takelage/bit/bit.clipboard.paste.feature) [COMPONENT] [DIR] | # Paste bit [COMPONENT] into [DIR]
 tau [bit clipboard pull](features/takelage/bit/bit.clipboard.pull.feature) | # Pull all updates for bit components from bit remote scopes
@@ -113,15 +114,13 @@ or *tau config*.
 
 ### Configuration Examples
  
-- You should the following configuration items in your *~/.takelage.yml*:
+- You should the following configuration items in your *~/.takelage.yml*
+if you want to use a private bit remote server:
 
 ```yaml
 ---
-bit_remote: 'ssh://bit@bit.example.com:2222:/bit'
-bit_ssh: 'ssh -p 2222 bit@bit.example.com'
-docker_image: 'takelage'
-docker_repo: 'hub.example.com'
-docker_tagsurl: 'https://hub.example.com/v2/repositories/library/takelage/tags'
+bit_remote: 'ssh://bit@bit.example.com:222:/bit'
+bit_ssh: 'ssh -p 222 bit@bit.example.com'
 ```
 
 - If you want to pin a specific docker tag for one of your projects

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

@@ -0,0 +1,23 @@
+module Takelage
+
+  # takelage bit check
+  class BitCheck < SubCommandBase
+
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include BitCheckModule
+
+    #
+    # bit check workspace
+    #
+    desc 'workspace', 'Check if a bit workspace exists'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check if a bit workspace exists
+    LONGDESC
+    # Check if a bit workspace exists.
+    def workspace
+      exit bit_check_workspace
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# takelage bit check module
+module BitCheckModule
+
+  # Backend method for bit check workspace.
+  # @return [Boolean] is this a bit workspace?
+  def bit_check_workspace
+    log.debug 'Check if this is a bit workspace'
+
+    cmd_bit_repo = config.active['bit_repo']
+    stdout_str_repo, stderr_str_repo, status_repo = run_and_check cmd_bit_repo
+
+    cmd_pwd = config.active['pwd']
+    stdout_str_dir, stderr_str_dir, status_dir = run_and_check cmd_pwd
+
+    dir = stdout_str_dir.strip
+
+    unless status_repo.exitstatus.zero?
+      log.debug "No bit workspace found in \"#{dir}\""
+      return false
+    end
+
+    true
+  end
+end

data/lib/takelage/bit/cli.rb

@@ -5,9 +5,8 @@ module Takelage
   # takelage bit
   class Bit < SubCommandBase
 
-    include LoggingModule
-    include SystemModule
-    include ConfigModule
+    desc 'check [COMMAND]', 'Check bit state'
+    subcommand 'check', BitCheck
 
     desc 'clipboard [COMMAND]', 'Manage bit clipboard'
     subcommand 'clipboard', BitClipboard

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

@@ -9,6 +9,7 @@ module Takelage
     include ConfigModule
     include SystemModule
     include GitCheckModule
+    include BitCheckModule
     include BitClipboardModule
 
     #

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

@@ -5,6 +5,11 @@ module BitClipboardModule
   def bit_clipboard_copy(dir, scope)
     log.debug "Running bit copy \"#{dir}\" to \"#{scope}\""
 
+    unless bit_check_workspace
+      log.error 'No bit workspace'
+      return
+    end
+
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
@@ -19,12 +24,30 @@ module BitClipboardModule
 
       log.debug "Adding the directory \"#{dir}\" as a tagged bit component"
 
-      # check if bit remote scope is added to local workspace
-      cmd_bit_list_remotes = config.active['bit_list_remotes']
-      stdout_str, stderr_str, status = run_and_check cmd_bit_list_remotes
-      unless /.*\s+#{scope}\s+.*/m.match? stdout_str
-        log.error "No bit remote scope \"#{scope}\" found in local bit workspace"
-        return
+      bit_dev = config.active['bit_dev']
+
+      # check if scope is a candidate for a bit.dev remote scope
+      if scope.start_with? bit_dev + '.'
+
+        # check if bit.dev remote scope exists
+        cmd_bit_list_scope = config.active['bit_list_scope'] % {scope: scope}
+        stdout_str, stderr_str, status = run_and_check cmd_bit_list_scope
+
+        unless status.exitstatus.zero?
+          log.error "No bit.dev remote scope \"#{scope}\" found"
+          return
+        end
+
+      else
+
+        # check if bit remote scope is added to local workspace
+        cmd_bit_list_remotes = config.active['bit_list_remotes']
+        stdout_str, stderr_str, status = run_and_check cmd_bit_list_remotes
+
+        unless /.*\s+#{scope}\s+.*/m.match? stdout_str
+          log.error "No bit remote scope \"#{scope}\" found in local bit workspace"
+          return
+        end
       end
 
       # check if a README.bit file exists in a subdirectory
@@ -73,6 +96,11 @@ module BitClipboardModule
   def bit_clipboard_paste(cid, dir)
     log.debug "Running bit paste \"#{cid}\" to \"#{dir}\""
 
+    unless bit_check_workspace
+      log.error 'No bit workspace'
+      return
+    end
+
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
@@ -97,6 +125,11 @@ module BitClipboardModule
   def bit_clipboard_pull
     log.debug "Running bit pull"
 
+    unless bit_check_workspace
+      log.error 'No bit workspace'
+      return
+    end
+
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'
@@ -122,6 +155,11 @@ module BitClipboardModule
   def bit_clipboard_push
     log.debug "Running bit push"
 
+    unless bit_check_workspace
+      log.error 'No bit workspace'
+      return
+    end
+
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'

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

@@ -7,6 +7,7 @@ module Takelage
     include SystemModule
     include ConfigModule
     include GitCheckModule
+    include BitCheckModule
     include BitScopeModule
 
     #

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

@@ -5,6 +5,11 @@ module BitScopeModule
   def bit_scope_add(scope)
     log.debug "Adding bit remote scope \"#{scope}\" to local workspace"
 
+    unless bit_check_workspace
+      log.error 'No bit workspace'
+      return
+    end
+
     if git_check_workspace
       unless git_check_master
         log.error 'Not on git master branch'

data/lib/takelage/default.yml

@@ -1,17 +1,24 @@
 ---
 bit_add_dir: 'bit add --skip-update --id %{id} --main %{dir}/README.bit %{dir}'
 bit_checkout_all: 'bit checkout --ignore-package-json --skip-update -i --all latest'
+bit_dev: 'takelage'
 bit_export_to_scope: 'bit export --skip-update %{scope}'
 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_remote: ''
+bit_repo: 'bit status'
 bit_scope_root: '/bit'
 bit_scope_list: 'find %{root} -name scope.json'
 bit_scope_new: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init -b'
 bit_scope_remove: 'rm -fr %{root}/%{scope}'
+bit_ssh: ''
 bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
 bit_tag_all: 'bit tag --all'
+docker_image: 'takelage'
+docker_repo: 'takelage'
 docker_socket_agent_port: 20000
 docker_socket_agent_ssh_port: 20001
 docker_socket_agent_extra_port: 20002
@@ -21,10 +28,12 @@ docker_socket_gpgconf: 'gpgconf --list-dirs'
 docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 docker_socket_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
 docker_tag: 'latest'
+docker_tagsurl: 'https://hub.docker.com/v2/repositories/takelage/takelage/tags'
+git_branch: 'git symbolic-ref HEAD'
+git_repo: 'git -C . rev-parse'
+git_status: 'git status --porcelain'
+git_unstaged: 'git diff --exit-code'
+git_uncommitted: 'git diff --cached --exit-code'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
-#bit_remote: 'ssh://bit@bit.example.com:2222:/bit'
-#bit_ssh: 'ssh -p 2222 bit@bit.example.com'
-#docker_image: 'takelage'
-#docker_repo: 'hub.docker.com'
-#docker_tagsurl: 'https://hub.docker.com/v2/repositories/library/takelage/tags'
+pwd: 'pwd'

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

@@ -163,7 +163,7 @@ module DockerContainerModule
 
   # Get container name by id.
   def _get_container_name_by_id container
-    log.debug "Getting name of container #{container}"
+    log.debug "Getting name of container \"#{container}\""
 
     cmd_get_container_name_by_id = 'docker ps ' +
         "--filter id=#{container} "+
@@ -171,13 +171,17 @@ module DockerContainerModule
 
     stdout_str, stderr_str, status = run_and_check cmd_get_container_name_by_id
 
-    stdout_str.chomp
+    name = stdout_str.chomp
+
+    log.debug "Container #{container} has name \"#{name}\""
+
+    name
   end
 
   # Get all docker containers.
   # @return [Array] list of docker containers
   def _get_containers
-    log.debug "Getting all #{@docker_image} containers"
+    log.debug "Getting all containers of image \"#{@docker_image}\""
 
     cmd_docker_get = 'docker ps ' +
         '--all ' +

data/lib/takelage/git/check/cli.rb

@@ -1,10 +1,11 @@
 module Takelage
 
-  # takelage docker container check
+  # takelage git check
   class GitCheck < SubCommandBase
 
     include LoggingModule
     include SystemModule
+    include ConfigModule
     include GitCheckModule
 
     #

data/lib/takelage/git/check/module.rb

@@ -8,9 +8,9 @@ module GitCheckModule
 
     return false unless git_check_workspace
 
-    cmd_git_unstaged = 'git diff --exit-code'
-    cmd_git_uncommitted = 'git diff --cached --exit-code'
-    cmd_git_status = 'git status --porcelain'
+    cmd_git_unstaged = config.active['git_unstaged']
+    cmd_git_uncommitted = config.active['git_uncommitted']
+    cmd_git_status = config.active['git_status']
 
     stdout_str, stderr_str, status_unstaged = run_and_check cmd_git_unstaged
     stdout_str, stderr_str, status_uncommitted = run_and_check cmd_git_uncommitted
@@ -31,7 +31,7 @@ module GitCheckModule
 
     return false unless git_check_workspace
 
-    cmd_get_branch = 'git symbolic-ref HEAD'
+    cmd_get_branch = config.active['git_branch']
     stdout_str, stderr_str, status = run_and_check cmd_get_branch
 
     branch = stdout_str.strip.split('/')[-1]
@@ -46,10 +46,10 @@ module GitCheckModule
   def git_check_workspace
     log.debug 'Check if this is a git workspace'
 
-    cmd_check_git_repo = 'git -C . rev-parse'
-    stdout_str_repo, stderr_str_repo, status_repo = run_and_check cmd_check_git_repo
+    cmd_git_repo = config.active['git_repo']
+    stdout_str_repo, stderr_str_repo, status_repo = run_and_check cmd_git_repo
 
-    cmd_pwd = 'pwd'
+    cmd_pwd = config.active['pwd']
     stdout_str_dir, stderr_str_dir, status_dir = run_and_check cmd_pwd
 
     dir = stdout_str_dir.strip

data/lib/takelage/version

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/takelage.rb

@@ -19,6 +19,8 @@ require_relative 'takelage/lib/project'
 require_relative 'takelage/git/check/module'
 require_relative 'takelage/git/check/cli'
 require_relative 'takelage/git/cli'
+require_relative 'takelage/bit/check/module'
+require_relative 'takelage/bit/check/cli'
 require_relative 'takelage/bit/scope/module'
 require_relative 'takelage/bit/scope/cli'
 require_relative 'takelage/bit/clipboard/module'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Geospin
@@ -177,6 +177,8 @@ files:
 - bin/tau
 - lib/Thorfile
 - lib/takelage.rb
+- lib/takelage/bit/check/cli.rb
+- lib/takelage/bit/check/module.rb
 - lib/takelage/bit/cli.rb
 - lib/takelage/bit/clipboard/cli.rb
 - lib/takelage/bit/clipboard/module.rb