dtk-client 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDc3MDgwYjMwMzU0MTM5Y2UzZGY5YTk4MGM3NDIxMTNkMjBlZjI0Ng==
-  data.tar.gz: !binary |-
-    N2QyN2FhN2JiMTNlZGU0YTM1YzAzYTE2ZGZiNTdlYjEyZGNmN2ZjMQ==
+SHA1:
+  metadata.gz: 255d3202f2e1ed5a8549778e48dbb1e98d83e287
+  data.tar.gz: c7c2879f1783ea5dfae4bba570e0587e7853c469
 SHA512:
-  metadata.gz: !binary |-
-    NDVmZGE3ODE2NjFhZWNmMGUxNDQ0YWI3ODM0NGU2NjRlZGFkNzlhZGQ0YzA5
-    NGNhOTUwYzgxMmUxZDgwODU1ZDhiZDljYWNjNWEwM2I3MWM3OTQ5MjFkOTIz
-    MmYxNjBjZTQwZjI5ZWRlMTA0NDkxYmE0MTc5YzM3MTY1NzllNzg=
-  data.tar.gz: !binary |-
-    MGU0MjZmMDViY2FiNGY3ZGMyMzVjMWJmNGE0NjFhZTljNjA1ZTExZjVlNjY5
-    MjEzN2JjOWE3MTEzMmI4NmUyOGM1ZWZjNzE4OTI4YzgxZDQyOGU0YmU5ZDEw
-    NGU4MGRhMGUwZmYzYzE0NjkzZDZmYmY5ZTU4ZGVkYjQ0NGVkZTM=
+  metadata.gz: edc060619dbdfee5195dd346a87a0c81edbe18c69a67704b0510c048560d60e125270f7dc27b40877f718453d2a288c992a8e56b0f11f308d46901a2cd8fb1d9
+  data.tar.gz: 436463ab2e98c92e9e5677ef12e54453eb9c2825249e2d1dd2b50592c65f87185d127b0c4a011dd113fb72f1e8bb44b0c8b7e8f98094e728db25b44778d90a5b

data/dtk-client.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'hirb','~> 0.7.0'
   gem.add_dependency 'thor','~> 0.15.4'
   gem.add_dependency 'erubis','~> 2.7.0'
-  gem.add_dependency 'dtk-common-core','~> 0.5.10'
+  gem.add_dependency 'dtk-common-core','~> 0.6.0'
   gem.add_dependency 'git','~> 1.2.6'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'

data/lib/command_helpers/git_repo.rb

@@ -12,18 +12,28 @@ module DTK; module Client; class CommandHelper
       GitAdapter.new(repo_dir,branch)
     end
 
+    def create_clone_from_optional_branch(type, module_name, repo_url, opts={})
+      branch = opts[:branch]
+      version = opts[:version]
+      namespace =  opts[:namespace]
+      create_clone_with_branch(type,module_name,repo_url,branch,version,namespace,{:track_remote_branch => true}.merge(opts))
+    end
+    # TODO: should we deprecate below for above, subsituting the body of below for above ?
     def create_clone_with_branch(type, module_name, repo_url, branch=nil, version=nil, module_namespace=nil, opts={})
       Response.wrap_helper_actions do
         full_name = module_namespace ? ModuleUtil.resolve_name(module_name, module_namespace) : module_name
 
         modules_dir = modules_dir(type,full_name,version,opts)
         FileUtils.mkdir_p(modules_dir) unless File.directory?(modules_dir)
+
         target_repo_dir = local_repo_dir(type,full_name,version,opts)
+        if File.exists?(target_repo_dir)
+          raise ErrorUsage.new("Directory '#{target_repo_dir}' is not empty; it must be deleted or removed before retrying the command")          
+        end
 
-        opts = {}
-        opts = { :branch => branch } if branch
         begin
-          GitAdapter.clone(repo_url, target_repo_dir, opts[:branch])
+          opts_clone = (opts[:track_remote_branch] ? {:track_remote_branch => true} : {})
+          GitAdapter.clone(repo_url, target_repo_dir, branch,opts_clone)
         rescue => e
           # Handling Git error messages with more user friendly messages
           e = GitErrorHandler.handle(e)
@@ -174,6 +184,7 @@ module DTK; module Client; class CommandHelper
         # creates directory if missing
         parent_path = new_dir.gsub(/(\/\w+)$/,'')
         FileUtils::mkdir_p(parent_path) unless File.directory?(parent_path)
+        # raise ErrorUsage.new("Destination folder already exists '#{new_dir}', aborting initialization.") if File.directory?(new_dir)
         FileUtils.mv(old_dir, new_dir)
       else
         new_dir = local_repo_dir
@@ -191,7 +202,7 @@ module DTK; module Client; class CommandHelper
         response =  unlink_local_clone?(type,module_name,version)
         unless response.ok?
           # in case delete went wrong, we raise usage error
-          raise ErrorUsage.new("Directory (#{local_repo_dir} is set as a git repo; to continue it must be a non git repo; this can be handled by shell command 'rm -rf #{local_repo_dir}/.git'")
+          raise DtkError.new("Directory (#{local_repo_dir} is set as a git repo; to continue it must be a non git repo; this can be handled by shell command 'rm -rf #{local_repo_dir}/.git'")
         end
         # we return to normal flow, since .git dir is removed
       end

data/lib/commands/common/thor/clone.rb

@@ -14,6 +14,7 @@ module DTK::Client
       full_module_name = ModuleUtil.resolve_name(module_name, module_namespace)
 
       return not_ok_response if not_ok_response
+      # TODO: should we use instead Helper(:git_repo).create_clone_from_optional_branch
       response = Helper(:git_repo).create_clone_with_branch(module_type,module_name,repo_url,branch,version,module_namespace,opts)
 
       if response.ok?

data/lib/commands/common/thor/module.rb

@@ -187,7 +187,11 @@ module DTK::Client
       namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
 
       # Create component module from user's input git repo
-      response = Helper(:git_repo).create_clone_with_branch(module_type.to_sym, local_module_name, git_repo_url, nil, nil, namespace)
+      opts = {
+        :namespace => namespace,
+        :branch  => options['branch']
+      }
+      response = Helper(:git_repo).create_clone_from_optional_branch(module_type.to_sym, local_module_name, git_repo_url, opts)
 
       # Raise error if git repository is invalid
       # raise DtkError,"Git repository URL '#{git_repo_url}' is invalid." unless response.ok?
@@ -208,6 +212,7 @@ module DTK::Client
           OsUtil.print("There are some missing dependencies: #{possibly_missing}", :yellow) unless possibly_missing.empty?
         end
       else
+        local_module_name = create_response.data[:full_module_name] if create_response.data[:full_module_name]
         delete_module_sub_aux(context_params, local_module_name, :force_delete => true, :no_error_msg => true, :purge => true)
         return create_response
       end
@@ -340,6 +345,7 @@ module DTK::Client
       end
 
       unless skip_cloning
+        # TODO: should we use instead Helper(:git_repo).create_clone_from_optional_branch
         response = Helper(:git_repo).create_clone_with_branch(module_type.to_sym, module_name, repo_url, branch, version, remote_namespace)
       end
 

data/lib/commands/common/thor/push_clone_changes.rb

@@ -68,7 +68,7 @@ module DTK::Client
         content = dsl_created_info["content"]
         if path and content
           msg = "A #{path} file has been created for you, located at #{repo_obj.repo_dir}" 
-          response = Helper(:git_repo).add_file(path,content,msg)
+          response = Helper(:git_repo).add_file(repo_obj,path,content,msg)
           return response unless response.ok?
         end
       end

data/lib/commands/thor/assembly.rb

@@ -264,7 +264,9 @@ module DTK::Client
       @@invalidate_map << :assembly
       
       assembly_template_name = get_assembly_name(assembly_template_id)
-      assembly_template_name.gsub!('::','-') if assembly_template_name
+      if assembly_template_name
+        assembly_template_name.gsub!(/(::)|(\/)/,'-')
+      end
 
       # we check current options and forwarded options (from deploy method)
       in_target = options["in-target"] || context_params.get_forwarded_thor_option("in-target")

data/lib/commands/thor/component_module.rb

@@ -184,7 +184,8 @@ TODO: might deprecate
     #
     # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
     #
-    desc "import-git GIT-SSH-REPO-URL [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new local component module by importing from provided git repo URL"
+    method_option :branch, :aliases => '-b'
+    desc "import-git GIT-SSH-REPO-URL [-b BRANCH/TAG] [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new local component module by importing from provided git repo URL"
     def import_git(context_params)
       import_git_module_aux(context_params)
     end

data/lib/commands/thor/service.rb

@@ -85,6 +85,11 @@ module DTK::Client
             :endpoint => "assembly",
             :url => "assembly/info_about",
             :opts => {:subtype=>"instance", :about=>"modules"}
+          },
+          :delete_node => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"nodes"}
           }
         }
       }
@@ -574,7 +579,13 @@ TODO: will put in dot release and will rename to 'extend'
       response = create_node_aux(context_params)
       return response unless response.ok?
 
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
       @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
       message = "Created node '#{response.data["display_name"]}'."
       DTK::Client::OsUtil.print(message, :yellow)
     end
@@ -601,7 +612,13 @@ TODO: will put in dot release and will rename to 'extend'
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_node(context_params)
       response = delete_node_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
       @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
 
       return response
     end

data/lib/commands/thor/workspace.rb

@@ -61,6 +61,11 @@ module DTK::Client
             :endpoint => "assembly", 
             :url => "assembly/info_about", 
             :opts => {:subtype=>"instance", :about=>"modules"}
+          },
+          :delete_node => {
+            :endpoint => "assembly",
+            :url => "assembly/info_about",
+            :opts => {:subtype=>"instance", :about=>"nodes"}
           }
         }
       }
@@ -245,7 +250,13 @@ module DTK::Client
       response = create_node_aux(context_params)
       return response unless response.ok?
 
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
       @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
       message = "Created node '#{response.data["display_name"]}'."
       DTK::Client::OsUtil.print(message, :yellow)
     end
@@ -291,7 +302,13 @@ module DTK::Client
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_node(context_params)
       response = delete_node_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
       @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
 
       return response
     end

data/lib/domain/git_adapter.rb

@@ -189,10 +189,24 @@ module DTK
         @git_repo.merge(remote_branch_ref)
       end
 
-      def self.clone(repo_url, target_path, branch)
+      def self.clone(repo_url, target_path, branch, opts={})
         git_base = Git.clone(repo_url, target_path)
-        git_base.branch(branch).checkout unless branch.nil?
-        git_base
+        unless branch.nil?
+          if opts[:track_remote_branch]
+            # This just tracks remote branch
+            begin 
+              git_base.checkout(branch)
+            rescue => e
+              # TODO: see if any other kind of error
+              raise DtkError.new("The branch or tag '#{branch}' does not exist on repo '#{repo_url}'")
+            end
+        else
+            # This wil first create a remote branch; 
+            # TODO: this might be wrong and should be deprecated
+            git_base.branch(branch).checkout 
+          end
+        end
+          git_base
       end
 
       def repo_dir

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.6.1"
+  VERSION="0.6.2"
 end

data/lib/shell/context.rb

@@ -229,7 +229,8 @@ module DTK
             clazz_from_args = DTK::Shell::Context.get_command_class(command_from_args) if command_from_args
           end
 
-          if (command.eql?('cd') || command.eql?('cc') || command.eql?('popc') || command.eql?('pushc'))
+          # this delete-node is a hack because we need autocomplete when there is node with name 'node'
+          if (command.eql?('cd') || command.eql?('cc') || command.eql?('popc') || command.eql?('pushc') || command.eql?('delete-node'))
             if is_root
               if entries.size >= 3
                 node = entries[2]

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -56,98 +56,98 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
@@ -328,17 +328,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.