takelage 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35adfe10263c8d04bf974bc0221c7ca79aea9a1586a0d14c67d13511103e8a3f
-  data.tar.gz: d80c8aea0868c5f3938fcd60f3a6e29606500d5b0d5b0170ad32b0d33c611dbe
+  metadata.gz: c97cc9d492c1532db93e5090ebf54357a46bf74ffa17f9ad55ad90d8a4595032
+  data.tar.gz: 59bca9e854ffe6441cfb80abf847c97b16390b86fef6c74d13aa6a6adfd5b66d
 SHA512:
-  metadata.gz: 5505234c2a2593280737aac1cdc3b61df9efb95396ebc47b79d04bc06e0d43387b49cd21933b045e826bced9f8392ff21758dcfa710b69992b8e78973e78ac76
-  data.tar.gz: 31c1429cff565b47be885d75b940420777b1d04035db179c15b15a2d1274533107db078e60ab26d0cd3f1a1c462d19180c779fb445d1eaac8462e686d69b898b
+  metadata.gz: ce47bc65c2f5c45685eafb643b30461562d3c24993378332f9d45a9fb590f106dab71d090ac4180ee5ac7fadb1574cd70e44ec37023cdcee275a9dd455ccd5ad
+  data.tar.gz: 217ac20d55861f557a4df55304f0888fa7bb58a773400f912405d0c48c9aee5db0cf300fa0da3187d19de513ea7ea13169daa57c7676ff1bc41985db817ce299

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

@@ -5,17 +5,7 @@ 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 false
-    end
-
-    if git_check_workspace
-      unless git_check_master
-        log.error 'Not on git master branch'
-        return false
-      end
-    end
+    return false unless _prepare_workspace
 
     if File.directory? dir
 
@@ -105,6 +95,7 @@ module BitClipboardModule
     run cmd_bit_export_to_scope
 
     _remove_bit_artifacts
+    _sync_workspace
 
     log.info "Copied directory \"#{dir}\" " +
                  "as bit component \"#{id}\" " +
@@ -116,17 +107,7 @@ 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 false
-    end
-
-    if git_check_workspace
-      unless git_check_master
-        log.error 'Not on git master branch'
-        return false
-      end
-    end
+    return false unless _prepare_workspace
 
     scope = cid.scan(/([^\/]*).*/).first.first
 
@@ -156,6 +137,7 @@ module BitClipboardModule
 
     _handle_bitignore
     _remove_bit_artifacts
+    _sync_workspace
 
     log.info "Pasted bit component \"#{cid}\" " +
                  "to directory \"#{dir}\""
@@ -166,17 +148,7 @@ module BitClipboardModule
   def bit_clipboard_pull
     log.debug "Running bit pull"
 
-    unless bit_check_workspace
-      log.error 'No bit workspace'
-      return false
-    end
-
-    if git_check_workspace
-      unless git_check_master
-        log.error 'Not on git master branch'
-        return false
-      end
-    end
+    return false unless _prepare_workspace
 
     # import components into workspace
     cmd_bit_import_all =
@@ -192,6 +164,7 @@ module BitClipboardModule
 
     _handle_bitignore
     _remove_bit_artifacts
+    _sync_workspace
 
     log.info "Pulled bit components"
     true
@@ -201,17 +174,7 @@ module BitClipboardModule
   def bit_clipboard_push
     log.debug "Running bit push"
 
-    unless bit_check_workspace
-      log.error 'No bit workspace'
-      return false
-    end
-
-    if git_check_workspace
-      unless git_check_master
-        log.error 'Not on git master branch'
-        return false
-      end
-    end
+    return false unless _prepare_workspace
 
     # tag all components
     cmd_bit_tag_all =
@@ -226,6 +189,7 @@ module BitClipboardModule
     run cmd_bit_export_all
 
     _remove_bit_artifacts
+    _sync_workspace
 
     log.info "Pushed bit components"
     true
@@ -279,29 +243,89 @@ module BitClipboardModule
     id
   end
 
+  # Prepare workspace for bit clipboard.
+  def _prepare_workspace
+    unless bit_check_workspace
+      log.error 'No bit workspace'
+      return false
+    end
+
+    if git_check_workspace
+
+      unless git_check_master
+        log.error 'Not on git master branch'
+        return false
+      end
+
+      unless git_check_clean
+        log.error 'No clean git workspace'
+        return false
+      end
+
+      log.debug "Updating git workspace"
+      cmd_bit_clipboard_git_pull =
+          config.active['cmd_bit_clipboard_git_pull']
+
+      result_git_pull = try cmd_bit_clipboard_git_pull
+
+      unless result_git_pull
+        log.error "Unable to update git workspace"
+        return false
+      end
+
+    end
+
+    true
+  end
+
   # Remove bit artifacts.
   def _remove_bit_artifacts
     log.debug "Removing bit artifacts"
 
-    _remove_node_modules
-    _remove_index_bit
-    _remove_package_json
-  end
-
-  # Remove node_modules directory.
-  def _remove_node_modules
+    # Remove node_modules directory.
     FileUtils.remove_entry_secure('node_modules', force: true)
-  end
 
-  # Remove index.bit files recursively.
-  def _remove_index_bit
+    # Remove index.bit files recursively.
     Dir.glob("./**/index.bit").each do |file|
       FileUtils.remove_entry_secure(file, force: true)
     end
-  end
 
-  # Remove package.json file.
-  def _remove_package_json
+    # Remove package.json file.
     FileUtils.remove_entry_secure('package.json', force: true)
   end
+
+  # Sync workspace with upstream.
+  def _sync_workspace
+    log.debug "Syncing git workspace"
+
+    rakefile, path = Rake.application.find_rakefile_location
+    bitmap = "#{path}/.bitmap"
+
+    log.debug "Adding \"#{bitmap}\" to git"
+
+    cmd_bit_clipboard_git_add =
+        config.active['cmd_bit_clipboard_git_add'] % {
+            file: bitmap
+        }
+
+    run cmd_bit_clipboard_git_add
+
+    message = "Update .bitmap"
+
+    log.debug "Committing \"#{bitmap}\" to git"
+
+    cmd_bit_clipboard_git_commit =
+        config.active['cmd_bit_clipboard_git_commit'] % {
+            message: message
+        }
+
+    run cmd_bit_clipboard_git_commit
+
+    log.debug "Pushing master branch to origin"
+
+    cmd_bit_clipboard_git_push =
+        config.active['cmd_bit_clipboard_git_push']
+
+    run cmd_bit_clipboard_git_push
+  end
 end

data/lib/takelage/default.yml

@@ -10,6 +10,10 @@ cmd_bit_clipboard_copy_bit_list_remotes: 'bit remote --skip-update'
 cmd_bit_clipboard_copy_bit_add_dir: 'bit add --skip-update --id %{id} --main %{dir}/README.bit %{dir}'
 cmd_bit_clipboard_copy_bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
 cmd_bit_clipboard_copy_bit_export_to_scope: 'bit export --skip-update %{scope}'
+cmd_bit_clipboard_git_add: 'git add %{file}'
+cmd_bit_clipboard_git_commit: 'git commit --message="%{message}"'
+cmd_bit_clipboard_git_pull: 'git pull origin master'
+cmd_bit_clipboard_git_push: 'git push origin master'
 cmd_bit_clipboard_paste_bit_list_scope: 'bit list --skip-update --json %{scope}'
 cmd_bit_clipboard_paste_bit_import_cid: 'bit import --ignore-package-json --ignore-dist --skip-update --path %{dir} %{cid}'
 cmd_bit_clipboard_pull_bit_import_all: 'bit import --ignore-package-json --ignore-dist --skip-update'

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

@@ -10,7 +10,10 @@ module DockerContainerModule
     docker_socket_start
 
     _create_network @hostname unless docker_container_check_network @hostname
-    _create_container @hostname unless docker_container_check_existing @hostname
+
+    container_created = true
+    container_created = _create_container @hostname unless docker_container_check_existing @hostname
+    return false unless container_created
     _run_command_in_container @hostname, command
   end
 
@@ -21,7 +24,10 @@ module DockerContainerModule
     return false unless docker_check_running
 
     _create_network @hostname unless docker_container_check_network @hostname
-    _create_container @hostname unless docker_container_check_existing @hostname
+
+    container_created = true
+    container_created = _create_container @hostname unless docker_container_check_existing @hostname
+    return false unless container_created
   end
 
   # Backend method for docker container login.
@@ -34,15 +40,19 @@ module DockerContainerModule
       outdated = docker_image_check_outdated @docker_tag
       if outdated
         tag_latest_remote = docker_image_tag_latest_remote
-        say "Your takelage version \"#{@docker_tag}\" is outdated"
-        say "A new takelage version \"#{tag_latest_remote}\" is available"
+        log.warn "#{@docker_user}/#{@docker_repo}:#{@docker_tag} is outdated"
+        log.warn "#{@docker_user}/#{@docker_repo}:#{tag_latest_remote} is available"
       end
     end
 
     docker_socket_start
 
     _create_network @hostname unless docker_container_check_network @hostname
-    _create_container @hostname unless docker_container_check_existing @hostname
+
+    container_created = true
+    container_created = _create_container @hostname unless docker_container_check_existing @hostname
+    return false unless container_created
+
     _enter_container @hostname
   end
 
@@ -52,6 +62,12 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
+    if ENV['HOSTNAME'].start_with? "#{@docker_repo}_"
+      log.error "Please run \"tau nuke\" outside of #{@docker_repo} containers"
+      log.info "Run \"tau purge\" to remove orphaned #{@docker_repo} containers"
+      return false
+    end
+
     networks = []
 
     _get_containers.each do |container|
@@ -90,17 +106,16 @@ module DockerContainerModule
   def _create_container(container)
     log.debug "Creating container \"#{container}\""
 
-    if docker_image_tag_list_local.include? @docker_tag
-      tag = @docker_tag
-    else
-      tag = docker_image_tag_latest_local
-    end
+    image = "#{@docker_user}/#{@docker_repo}:#{@docker_tag}"
 
-    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
+    unless docker_image_tag_list_local.include? @docker_tag
+      log.error "No local image \"#{image}\" available"
+      return false
+    end
 
     log.debug "Using docker image \"#{image}\""
 
-    unless docker_image_tag_check_local tag
+    unless docker_image_tag_check_local @docker_tag
       log.error "Image \"#{image}\" does not exist"
       return false
     end
@@ -134,6 +149,7 @@ module DockerContainerModule
         }
 
     run cmd_docker_create
+    true
   end
 
   # Create docker network.

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

@@ -47,7 +47,7 @@ module DockerImageTagCheckModule
 
     tags = docker_image_tag_list_remote
 
-    unless tags.include? tag
+    unless tags != false and tags.include? tag
       log.debug "No remote docker image \"#{image}\" found"
       return false
     end

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

@@ -26,7 +26,7 @@ module DockerImageTagLatestModule
 
     tags = docker_image_tag_list_remote
 
-    if tags.nil?
+    if tags == false or tags.nil?
       log.warn "No latest docker remote tag"
       return ''
     end

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

@@ -26,13 +26,14 @@ module DockerImageTagListModule
                   "of \"#{@docker_user}/#{@docker_repo}\" " +
                   "from \"#{@docker_registry}\""
 
-    registry = DockerRegistry2.connect(@docker_registry)
-
-    log.debug ("Connected to registry \"#{@docker_registry}\"")
-
     user = File.basename @docker_user
-
-    tags = registry.tags("#{user}/#{@docker_repo}")
+    begin
+      registry = DockerRegistry2.connect(@docker_registry)
+      tags = registry.tags("#{user}/#{@docker_repo}")
+    rescue RestClient::Exceptions::OpenTimeout
+      log.error "Timeout while connecting to \"#{@docker_registry}\""
+      return false
+    end
 
     VersionSorter.sort(tags['tags'])
   end

data/lib/takelage/version

@@ -1 +1 @@
-0.11.1
+0.12.0

metadata

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