dtk-client 0.7.1.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzU5NzQ4MDE1NmNlMTU2NmViZWNkODkzMzRjOTMzMWVmMDI3MmVkZQ==
-  data.tar.gz: !binary |-
-    NDJjZDIyMmVkYjY2ZDdlOGY2ZjY1ODljYWI2YzBhMDA1NzVjMDUyNQ==
+SHA1:
+  metadata.gz: d7b720c50b249bbf6c309691e139bce76d5ce56a
+  data.tar.gz: 9decd8f03d3b2fed899f7b30f5e77c43b3934271
 SHA512:
-  metadata.gz: !binary |-
-    NmZjOWE0YmRlZjVkY2M0YThlNDUzMzc1NTA0MGIxOTQxMDQwZTdjM2ZmNWFk
-    MzRiMDVlZTBmZjUwODhlYjE5NjNlYTE0OTZmMGRhMDNmNDYzM2Y0YTkxMTc5
-    NTY4MmU3NmFmNzhmNjVkYzY1NjY2MTBmZTQ0Y2M3OTlmY2IxMzM=
-  data.tar.gz: !binary |-
-    ZDllMmIyYjQ2NGMyY2ZlYzc4MDM2Y2M5YzM1MTI1MmE0NTYyOTljOGY2YmRl
-    ODRlYzg5ZTM4MTVjNWNmODI3ODNlZTgxNWU2ZWJkMzQ0ODVhZGViYjYzNzE1
-    MjUyMDAyNGViNjkyMWY1YjI2M2YwNjBmYjdjM2I1OWE3MWY0OGQ=
+  metadata.gz: 020f067a80f545dd864ca53b5a4cfd7b5f5dd59305f469d9c581081f2d8411db6da95e4e3246897e4ca557afb57c36f686b16fea6db497e3f02725ec6f8af96d
+  data.tar.gz: 9e39ec3fa3e2c5d8e06b1c4c9b5eb27e364df7f744e0a3cb028eaef3f532e72eee829a3806d39392adb4893f09be6a6b0278825424d07b25fd0309d7d35949e6

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # dependcies are defined in gemspec file since to avoid duplication
 # gemspec :name => 'dtk-client'

data/Gemfile_dev

@@ -7,6 +7,7 @@ gemspec
 # development gems which are not included in production Gemfile
 gem 'rspec','~> 2.12.0'
 gem 'awesome_print','~> 1.1.0'
+gem 'looksee'
 
 gem 'ruby-debug','0.10.4' if RUBY_VERSION == '1.8.7'
 gem 'debugger','>= 1.6.5' if RUBY_VERSION == '1.9.3'

data/bin/dtk-execute

@@ -12,21 +12,4 @@ Configurator.check_config_exists
 conn = Session.get_connection()
 exit if validate_connection(conn)
 
-require 'optparse'
-banner = "Usage: dtk-execute add-tenant TENANT-NAME"
-tenant_name = nil
-if ARGV.size == 2
-  if ARGV[0] == 'add-tenant'
-    tenant_name = ARGV[1]
-  end
-end
-unless tenant_name
-  # forces usage then exit
-  ARGV[0] = '--help'
-end
-options = {}
-OptionParser.new do |opts|
-  opts.banner = banner
-end.parse!
-  
-Execute.add_tenant(tenant_name)
+Execute::Script.execute()

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.7.0.1'
+  gem.add_dependency 'dtk-common-core','0.7.1'
   gem.add_dependency 'git','~> 1.2.6'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'

data/lib/client.rb

@@ -14,11 +14,6 @@ begin
   # Monkey Patching bundler to support loading specific Gemfile from dtk-client project's root - Ticket: DTK-585
   dtk_require("config/configuration")
 
-
-  if DTK::Configuration.get(:debug_grit)
-    # INSERT NEW CODE HERE
-  end
-
   # we don't need Bundler.setup but will leave it commented just in case
   # TODO: This is temp solution which will not use bundler.setup when in dev mode
   # thus allowing us to use system gems and not just the ones specified in Gemfile

data/lib/command_helpers/git_repo.rb

@@ -75,11 +75,11 @@ module DTK; module Client; class CommandHelper
     # :local_branch
     # :no_fetch
     #
-    def push_changes(type,full_module_name,version,opts={})
+    def push_changes(type, full_module_name, version, opts={})
       Response.wrap_helper_actions() do
-        repo_dir = local_repo_dir(type,full_module_name,version,opts)
+        repo_dir = local_repo_dir(type, full_module_name, version, opts)
         repo = create(repo_dir,opts[:local_branch])
-        push_repo_changes_aux(repo,opts)
+        push_repo_changes_aux(repo, opts)
       end
     end
 
@@ -160,7 +160,7 @@ module DTK; module Client; class CommandHelper
       end
     end
 
-    def check_local_dir_exists_with_content(type,module_name,version=nil,module_namespace=nil)
+    def check_local_dir_exists_with_content(type, module_name, version=nil, module_namespace=nil)
       full_module_name = ModuleUtil.join_name(module_name, module_namespace)
       Response.wrap_helper_actions() do
         ret = Hash.new
@@ -189,6 +189,28 @@ module DTK; module Client; class CommandHelper
       end
     end
 
+    def cp_r_to_new_namespace(type, module_name, src_namespace, dest_namespace, version = nil)
+      full_name_src  = ModuleUtil.join_name(module_name, src_namespace)
+      full_name_dest = ModuleUtil.join_name(module_name, dest_namespace)
+
+      local_src_dir  = local_repo_dir(type, full_name_src, version)
+      local_dest_dir = local_repo_dir(type, full_name_dest, version)
+
+      Response.wrap_helper_actions() do
+        if File.directory?(local_src_dir) && !(Dir["#{local_src_dir}/*"].empty?)
+          raise ErrorUsage.new("Directory (#{local_dest_dir}) already exist with content.",:log_error=>false) if File.directory?(local_dest_dir) && !(Dir["#{local_dest_dir}/*"].empty?)
+
+          # create namespace directory if does not exist, and copy source to destination module directory
+          namespace_dir = local_repo_dir(type, dest_namespace, version)
+          FileUtils.mkdir_p(namespace_dir)
+          FileUtils.cp_r(local_src_dir, local_dest_dir)
+        else
+          raise ErrorUsage.new("The content for module (#{full_name_src}) should be put in directory (#{local_src_dir})",:log_error=>false)
+        end
+        {"module_directory" => local_dest_dir}
+      end
+    end
+
     def rename_and_initialize_clone_and_push(type, module_name, new_module_name, branch, repo_url, local_repo_dir, version = nil)
       # check to see if the new dir has proper naming e.g. (~/dtk/component_modules/dtk::java)
       unless local_repo_dir.match(/\/#{new_module_name.gsub(ModuleUtil::NAMESPACE_SEPERATOR,'/')}$/)
@@ -283,7 +305,7 @@ module DTK; module Client; class CommandHelper
     #returns hash with keys
     #: diffs - hash with diffs
     # commit_sha - sha of currenet_commit
-    def push_repo_changes_aux(repo,opts={})
+    def push_repo_changes_aux(repo, opts={})
       diffs = DiffSummary.new()
 
       # adding untracked files (newly added files)
@@ -308,31 +330,40 @@ module DTK; module Client; class CommandHelper
 
       #check if merge needed
       commit_shas = Hash.new
-      merge_rel = repo.merge_relationship(:remote_branch,remote_branch_ref, :ret_commit_shas => commit_shas)
-      commit_sha = nil
+      merge_rel   = repo.merge_relationship(:remote_branch,remote_branch_ref, :ret_commit_shas => commit_shas)
+      commit_sha  = nil
+      diffs       = DiffSummary.new_version(repo)
+
       if merge_rel == :equal
         commit_sha = commit_shas[:other_sha]
       elsif [:branchpoint,:local_behind].include?(merge_rel)
-        raise ErrorUsage.new("Merge needed before module (#{pp_module(repo)}) can be pushed to server")
+        if opts[:force]
+          diffs = DiffSummary.diff(repo,local_branch, remote_branch_ref)
+          if diffs.any_diffs?()
+            repo.push(remote_branch_ref, {:force => opts[:force]})
+          end
+          commit_sha = repo.find_remote_sha(remote_branch_ref)
+        else
+          where = opts[:where]||'server'
+          raise ErrorUsage.new("Merge needed before module (#{pp_module(repo)}) can be pushed to #{where}. If you want to force push use '--force' option.")
+        end
       elsif merge_rel == :no_remote_ref
         repo.push(remote_branch_ref)
-        diffs = DiffSummary.new_version(repo)
         commit_sha = commit_shas[:local_sha]
       elsif merge_rel == :local_ahead
         # see if any diffs between fetched remote and local branch
         # this has be done after commit
-
         diffs = DiffSummary.diff(repo,local_branch, remote_branch_ref)
 
-
         if diffs.any_diffs?()
-          repo.push(remote_branch_ref)
+          repo.push(remote_branch_ref, {:force => opts[:force]})
         end
 
         commit_sha = repo.find_remote_sha(remote_branch_ref)
       else
         raise Error.new("Unexpected merge_rel (#{merge_rel})")
       end
+
       {"diffs" => diffs, "commit_sha" => commit_sha, "repo_obj" => repo}
     end
 

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

@@ -5,7 +5,7 @@ dtk_require_from_base("dtk_logger")
 dtk_require_from_base("util/os_util")
 dtk_require_from_base("command_helper")
 dtk_require_common_commands('thor/task_status')
-dtk_require_common_commands('thor/set_required_params')
+dtk_require_common_commands('thor/set_required_attributes')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/purge_clone')
 dtk_require_common_commands('thor/list_diffs')
@@ -1022,9 +1022,9 @@ module DTK::Client
       response.render_table(:ps_data)
     end
 
-    def set_required_params(context_params)
+    def set_required_attributes(context_params)
       assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
-      set_required_params_aux(assembly_or_workspace_id,:assembly,:instance)
+      set_required_attributes_aux(assembly_or_workspace_id,:assembly,:instance)
     end
 
     def tail_aux(context_params)

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

@@ -9,6 +9,7 @@ dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/reparse')
 dtk_require_common_commands('thor/purge_clone')
 dtk_require_common_commands('thor/common')
+dtk_require_common_commands('thor/remotes')
 
 dtk_require_from_base('configurator')
 dtk_require_from_base('command_helpers/service_importer')
@@ -44,14 +45,19 @@ module DTK::Client
     # TODO: when we do this for other areas we can move these things up and use as common classes
     # helpers
     def retrieve_arguments(mapping, method_info = nil)
-      @context_params.retrieve_arguments(mapping, method_info||@command.method_argument_names)
+      @context_params.retrieve_arguments(mapping, method_info || @command.method_argument_names)
     end
+
     def get_namespace_and_name(*args)
       @command.get_namespace_and_name(*args)
     end
   end
 
   module ModuleMixin
+
+    REQ_MODULE_ID   = [:service_module_id!, :component_module_id!, :test_module_id!]
+    REQ_MODULE_NAME = [:service_module_name!, :component_module_name!, :test_module_name!]
+
     include PuppetForgeMixin
     include CloneMixin
     include PushToRemoteMixin
@@ -63,9 +69,7 @@ module DTK::Client
     include ListDiffsMixin
     include ServiceImporter
     include AccessControlMixin
-
-    REQ_MODULE_ID   = [:service_module_id!, :component_module_id!, :test_module_id!]
-    REQ_MODULE_NAME = [:service_module_name!, :component_module_name!, :test_module_name!]
+    include RemotesMixin
 
     def get_module_type(context_params)
       forwarded_type = context_params.get_forwarded_options() ? context_params.get_forwarded_options()[:module_type] : nil
@@ -427,6 +431,53 @@ module DTK::Client
       edit_aux(module_type.to_sym, module_id, module_name, version, opts)
     end
 
+    def push_remote_module_aux(context_params)
+      module_id, module_name, remote_name = context_params.retrieve_arguments([REQ_MODULE_ID, REQ_MODULE_NAME, :option_1],method_argument_names)
+      version     = options["version"]
+      module_type = get_module_type(context_params)
+
+      post_body = {
+        "#{module_type}_id".to_sym => module_id
+      }
+
+      response      = post rest_url("#{module_type}/info_git_remote"), post_body
+      remotes_list  = response.data
+
+      # vital information, abort if it does not exist
+      raise DtkError, "There are no registered remotes, aborting action" if remotes_list.empty?
+
+      # check if there is provided remote
+      if remote_name
+        target_remote = remotes_list.find { |r| remote_name.eql?(r['display_name']) }
+        raise DtkError, "Not able to find remote '#{remote_name}'" unless target_remote
+      end
+
+      # if only one take it, else raise ambiguous error
+      unless target_remote
+        if remotes_list.size == 1
+          target_remote = remotes_list.first
+        else
+          remote_names = remotes_list.collect { |r| r['display_name'] }
+          raise DtkError, "Call is ambiguous, please provide remote name. Remotes: #{remote_names.join(', ')} "
+        end
+      end
+
+      # clone if necessry
+      module_location = OsUtil.module_location(resolve_module_type(), module_name, version)
+      unless File.directory?(module_location)
+        response = clone_aux(module_type.to_sym, module_id, version, true, true)
+        return response unless response.ok?
+      end
+
+
+      OsUtil.print("Pushing local content to remote #{target_remote['repo_url']} ... ", :yellow)
+      push_to_git_remote_aux(module_name, module_type.to_sym, version, {
+          :remote_repo_url => target_remote['repo_url'],
+          :remote_branch   => 'master',
+          :remote_repo     =>  "#{target_remote['display_name']}--remote"
+        },  options.force?)
+    end
+
     def push_dtkn_module_aux(context_params, internal_trigger=false)
       module_id, module_name = context_params.retrieve_arguments([REQ_MODULE_ID, REQ_MODULE_NAME],method_argument_names)
       catalog     = 'dtkn'
@@ -439,8 +490,6 @@ module DTK::Client
       reparse_aux(module_location) unless internal_trigger
       local_namespace, local_module_name = get_namespace_and_name(module_name,':')
 
-#      if catalog.to_s.eql?("origin")
-#        push_clone_changes_aux(:component_module,component_module_id,version,options["message"]||DEFAULT_COMMIT_MSG,internal_trigger)
       if catalog.to_s.eql?("dtkn")
         module_refs_content = RemoteDependencyUtil.module_ref_content(module_location)
         remote_module_info  = get_remote_module_info_aux(module_type.to_sym, module_id, options["namespace"], version, module_refs_content, local_namespace)
@@ -457,11 +506,12 @@ module DTK::Client
           return response
         end
 
-        push_to_remote_aux(remote_module_info, module_type.to_sym)
+        push_to_remote_aux(remote_module_info, module_type.to_sym, options.force?)
       else
         raise DtkValidationError, "You have to provide valid catalog to push changes to! Valid catalogs: #{PushCatalogs}"
       end
     end
+
     PushCatalogs = ["origin", "dtkn"]
 
     def list_diffs_module_aux(context_params)
@@ -558,6 +608,30 @@ module DTK::Client
       response.render_table(:assembly)
     end
 
+    def fork_aux(context_params)
+      module_type = get_module_type(context_params)
+      module_id, fork_namespace = context_params.retrieve_arguments([REQ_MODULE_ID, :option_1!], method_argument_names)
+
+      raise DtkValidationError, "Namespace '#{fork_namespace}' contains invalid characters. Valid characters are letters, numbers, dash and underscore." unless fork_namespace.to_s =~ /^[0-9a-zA-Z\_\-]*$/
+
+      module_name = context_params.retrieve_arguments(["#{module_type}_name".to_sym],method_argument_names)
+      namespace, name = get_namespace_and_name(module_name,':')
+      response = Helper(:git_repo).cp_r_to_new_namespace(module_type, name, namespace, fork_namespace)
+      return response unless response.ok?
+
+      new_context_params = DTK::Shell::ContextParams.new
+      new_context_params.add_context_to_params(module_type, module_type)
+      new_context_params.method_arguments = ["#{fork_namespace}:#{name}"]
+
+      create_response = CommonModule::Import.new(self, new_context_params).from_file()
+      unless create_response.ok?
+        FileUtils.rm_rf("#{response['data']['module_directory']}")
+        return create_response
+      end
+
+      Response::Ok.new()
+    end
+
     def print_ambiguous(ambiguous)
     end
 

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

@@ -13,10 +13,10 @@ module DTK::Client
       def from_git()
         git_repo_url, module_name    = retrieve_arguments([:option_1!, :option_2!])
         namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
-        
+
         module_type  = @command.get_module_type(@context_params)
         thor_options = { :git_import => true}
-        
+
         unless namespace
           namespace_response = post rest_url("namespace/default_namespace_name")
           return namespace_response unless namespace_response.ok?
@@ -29,6 +29,7 @@ module DTK::Client
           :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)
         return response unless response.ok?
 
@@ -102,11 +103,18 @@ module DTK::Client
       private
 
       def from_git_or_file()
+
         default_ns = @context_params.get_forwarded_options()[:default_namespace]
         git_import = @context_params.get_forwarded_options()[:git_import]
 
         name_option = git_import ? :option_2! : :option_1!
-        module_name = @context_params.retrieve_arguments([name_option])
+
+        if git_import
+          module_git_url, module_name = @context_params.retrieve_arguments([:option_1!, :option_2!])
+        else
+          module_name, module_git_url = @context_params.retrieve_arguments([:option_1!, :option_2!])
+        end
+
         module_type = @command.get_module_type(@context_params)
         version     = @options["version"]
 
@@ -125,8 +133,10 @@ module DTK::Client
         # first make call to server to create an empty repo
         post_body = {
           :module_name => local_module_name,
-          :module_namespace => namespace
+          :module_namespace => namespace,
+          :module_git_url   => module_git_url
         }
+
         response = post(rest_url("#{module_type}/create"), post_body)
         return response unless response.ok?
 

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

@@ -28,6 +28,8 @@ module DTK::Client
       end
 
       # check whether a local module exists to determine whether pull from local clone or try to pull from server
+      OsUtil.print("Pulling changes to remote: #{remote_params[:remote_repo]} @ #{remote_params[:remote_repo_url]}")
+
       if Helper(:git_repo).local_clone_dir_exists?(module_type,module_name,:full_module_name=>full_module_name,:version=>version)
         unless rsa_pub_key
           raise DtkError,"No File found at (#{path_to_key}). Path is wrong or it is necessary to generate the public rsa key (e.g., run ssh-keygen -t rsa)"

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

@@ -23,7 +23,7 @@ module DTK::Client
         end
       end
 
-      push_opts = opts.merge(:commit_msg => commit_msg, :local_branch => branch)
+      push_opts = opts.merge(:commit_msg => commit_msg, :local_branch => branch, :where => 'server')
       response  = Helper(:git_repo).push_changes(module_type, full_module_name, version, push_opts)
       return response unless response.ok?
 

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

@@ -2,7 +2,20 @@ dtk_require_common_commands('thor/common')
 module DTK::Client
   module PushToRemoteMixin
 
-    def push_to_remote_aux(remote_module_info, module_type)
+    def push_to_git_remote_aux(full_module_name, module_type, version, opts, force = false)
+      opts.merge!(:force => force)
+
+      response = Helper(:git_repo).push_changes(module_type, full_module_name, version, opts)
+
+      return response unless response.ok?
+      if response.data(:diffs).empty?
+        raise DtkError, "No changes to push"
+      end
+
+      Response::Ok.new()
+    end
+
+    def push_to_remote_aux(remote_module_info, module_type, force = false)
       full_module_name     = remote_module_info.data(:full_module_name)
       version = remote_module_info.data(:version)
 
@@ -10,10 +23,11 @@ module DTK::Client
         :remote_repo_url => remote_module_info.data(:remote_repo_url),
         :remote_repo => remote_module_info.data(:remote_repo),
         :remote_branch => remote_module_info.data(:remote_branch),
-        :local_branch => remote_module_info.data(:workspace_branch)
+        :local_branch => remote_module_info.data(:workspace_branch),
+        :where => 'catalog',
+        :force => force
       }
-
-      response = Helper(:git_repo).push_changes(module_type,full_module_name,version,opts)
+      response = Helper(:git_repo).push_changes(module_type, full_module_name, version, opts)
       return response unless response.ok?
       if response.data(:diffs).empty?
         raise DtkError, "No changes to push"