dtk-client 0.7.7 → 0.7.8

data/lib/commands/thor/target.rb

@@ -93,7 +93,7 @@ module DTK::Client
     method_option :security_group, :type => :string, :aliases => '--security-groups'
     def create_target_ec2_classic(context_params)
       option_list = [:provider!, :region!, :keypair, :security_group]
-      response = Common::CreateTarget.new(self,context_params).execute(:ec2_classic,option_list)
+      response = Common::CreateTarget.new(self, context_params).execute(:ec2_classic,option_list)
       @@invalidate_map << :target
       response
     end
@@ -106,7 +106,7 @@ module DTK::Client
     method_option :security_group, :type => :string, :aliases => '--security-groups'
     def create_target_ec2_vpc(context_params)
       option_list = [:provider!, :subnet!, :region!, :keypair, :security_group]
-      response = Common::CreateTarget.new(self,context_params).execute(:ec2_vpc,option_list)
+      response = Common::CreateTarget.new(self, context_params).execute(:ec2_vpc,option_list)
       @@invalidate_map << :target
       response
     end

data/lib/commands/thor/test_module.rb

@@ -150,7 +150,7 @@ module DTK::Client
       publish_module_aux(context_params)
     end
 
-    desc "TEST-MODULE-NAME/ID pull-dtkn [-n NAMESPACE] [--force]", "Update local test module from remote repository."
+    desc "TEST-MODULE-NAME/ID update [-n NAMESPACE] [--force]", "Update local test module from remote repository."
     method_option :namespace,:aliases => '-n',
       :type   => :string,
       :banner => "NAMESPACE",
@@ -159,8 +159,8 @@ module DTK::Client
       :type    => :boolean,
       :desc   => "Force pull",
       :default => false
-    def pull_dtkn(context_params)
-      pull_dtkn_aux(context_params)
+    def update(context_params)
+      update_aux(context_params)
     end
 
     desc "TEST-MODULE-NAME/ID chmod PERMISSION-SELECTOR", "Update remote permissions e.g. ug+rw , user and group get RW permissions"

data/lib/domain/git_adapter.rb

@@ -187,6 +187,14 @@ module DTK
         end
       end
 
+      def delete_branch(branch, opts = {})
+        @git_repo.branch(branch).delete
+      end
+
+      def checkout(branch, opts = {})
+        @git_repo.checkout(branch, opts)
+      end
+
       def push(remote_branch_ref, opts={})
         remote, remote_branch = remote_branch_ref.split('/')
         push_with_remote(remote, remote_branch, opts)

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.7"
+  VERSION="0.7.8"
 end

data/lib/util/console.rb

@@ -76,6 +76,33 @@ module DTK::Client
         end
       end
 
+      # multiple choice
+      # e.g.
+      # Select version to delete:
+      # 1. base
+      # 2. 0.0.1
+      # 3. 0.0.2
+      # 4. all
+      # > 2
+      def confirmation_prompt_multiple_choice(message, opts_array)
+        indexes = opts_array.map{ |opt| "#{opts_array.index(opt)+1}" }
+
+        trap("INT", "SIG_IGN")
+
+        message << "\n"
+        opts_array.each {|opt| message << "#{opts_array.index(opt)+1}. #{opt}\n" }
+        message << "> "
+
+        while line = Readline.readline("#{message}", true)
+          if indexes.include?(line)
+            trap("INT",false)
+            return opts_array[line.to_i-1]
+          elsif line.eql?('exit')
+            return nil
+          end
+        end
+      end
+
       # Loading output used to display waiting status
       def wait_animation(message, time_seconds)
         print message

data/lib/util/os_util.rb

@@ -127,9 +127,10 @@ module DTK
         end
 
         def module_version_locations(module_type,module_name,version=nil,opts={})
-          base_path = module_location_parts(module_type,module_name,version,opts).first
-          module_versions = Dir.entries(base_path).select{|a| a.match(/^#{module_name}-\d.\d.\d$/)}
-          module_versions.map{|version|"#{base_path}/#{version}"}
+          base_path, namespace, name = module_location_parts(module_type,module_name,version,opts) #.first
+          namespace_path = "#{base_path}/#{namespace}"
+          module_versions = Dir.entries(namespace_path).select{|a| a.match(/^#{name}-\d{1,2}.\d{1,2}.\d{1,2}$/)}
+          module_versions.map{ |version|"#{namespace_path}/#{version}" }
         end
 
         def module_clone_location(module_type)

data/lib/util/remote_dependency_util.rb

@@ -33,14 +33,24 @@ module DTK
           if dependency_warnings && !dependency_warnings.empty?
             no_permissions = dependency_warnings.select { |warning| warning['error_type'].eql?('no_permission') }
 
-            errors << "\n\nYou do not have (R) permissions for modules:\n\n"
-            no_permissions.each { |np| errors << "  - #{np['module_namespace']}:#{np['module_name']} (owner: #{np['module_owner']})\n" }
-            errors << "\nPlease contact owner(s) to change permissions for those modules."
+            unless no_permissions.empty?
+              errors << "\n\nYou do not have (R) permissions for modules:\n\n"
+              no_permissions.each { |np| errors << "  - #{np['module_namespace']}:#{np['module_name']} (owner: #{np['module_owner']})\n" }
+              errors << "\nPlease contact owner(s) to change permissions for those modules."
+            end
           end
 
           raise DtkError, errors unless errors.empty?
         end
 
+        # check if all dependent modules are frozen; if they are don't display prompt for update
+        def check_for_frozen_modules(required_modules)
+          return true if required_modules.nil? || required_modules.empty?
+
+          modules_to_update = required_modules.select{ |md| (md['frozen'].nil? || md['frozen'] == false)}
+          return modules_to_update.empty?
+        end
+
         def module_ref_content(location)
           abs_location = File.join(location, MODULE_REF_FILE)
           File.exists?(abs_location) ? File.read(abs_location) : nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement