dtk-client 0.6.7 → 0.6.8

data/lib/commands/thor/component_module.rb

@@ -108,28 +108,20 @@ module DTK::Client
     def import(context_params)
       response = import_module_aux(context_params)
       @@invalidate_map << :component_module
-
       response
     end
 
-=begin
-    desc "import-puppet-forge PUPPET-MODULE-NAME [NAMESPACE:]COMPONENT-MODULE-NAME", "Install puppet module from puppet forge"
+    desc "import-puppet-forge PUPPET-MODULE-NAME [[NAMESPACE:]COMPONENT-MODULE-NAME]", "Install puppet module from puppet forge"
     def import_puppet_forge(context_params)
-      pf_module_name, full_module_name = context_params.retrieve_arguments([:option_1!, :option_2!],method_argument_names)
+      pf_module_name, full_module_name = context_params.retrieve_arguments([:option_1!, :option_2],method_argument_names)
       namespace, module_name = get_namespace_and_name(full_module_name, ModuleUtil::NAMESPACE_SEPERATOR)
+      module_type            = get_module_type(context_params)
 
-      response = post rest_url("component_module/install_puppet_module"), {
-        :puppetf_module_name => pf_module_name,
-        :module_name => module_name,
-        :module_namespace => namespace
-      }
-
-      return response unless response.ok?
+      response = puppet_forge_install_aux(context_params, pf_module_name, module_name, namespace, nil, module_type)
 
       @@invalidate_map << :component_module
       response
     end
-=end
 
     #
     # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
@@ -137,7 +129,9 @@ module DTK::Client
     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)
+      response = import_git_module_aux(context_params)
+      @@invalidate_map << :component_module
+      response
     end
 
 =begin
@@ -180,7 +174,7 @@ module DTK::Client
 
 
 =begin
-    => DUE TO DEPENDENCY TO PUPPET GEM WE OMMIT THIS <=
+    => DUE TO DEPENDENCY TO PUPPET GEM WE OMIT THIS <=
     desc "import-puppet-forge PUPPET-FORGE-MODULE-NAME", "Imports puppet module from puppet forge via puppet gem"
     def import_puppet_forge(context_params)
       module_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
@@ -211,7 +205,7 @@ module DTK::Client
       return response unless response.ok?
       module_name,repo_url,branch,version = response.data(:module_name,:repo_url,:workspace_branch,:version)
 
-      if error = response.data(:dsl_parsed_info)
+      if error = response.data(:dsl_parse_error)
         dsl_parsed_message = ServiceImporter.error_message(module_name, error)
         DTK::Client::OsUtil.print(dsl_parsed_message, :red)
       end
@@ -414,10 +408,11 @@ module DTK::Client
 
 #    desc "COMPONENT-MODULE-NAME/ID list-diffs [-v VERSION] [--remote]", "List diffs"
     # version_method_option
-    desc "COMPONENT-MODULE-NAME/ID list-diffs [--remote]", "List diffs"
+    desc "COMPONENT-MODULE-NAME/ID list-diffs", "List diffs between module on server and remote repo"
     method_option :remote, :type => :boolean, :default => false
     def list_diffs(context_params)
-      list_diffs_module_aux(context_params)
+      list_remote_module_diffs(context_params)
+      # list_diffs_module_aux(context_params)
     end
 
     #

data/lib/commands/thor/service.rb

@@ -434,6 +434,11 @@ TODO: will put in dot release and will rename to 'extend'
       return response
     end
 
+    desc "SERVICE-NAME/ID list-diffs COMPONENT-MODULE-NAME", "List diffs between module in service instance and base module."
+    def list_diffs(context_params)
+      list_remote_module_diffs(context_params)
+    end
+
     # desc "ASSEMBLY-NAME/ID list-attribute-mappings SERVICE-LINK-NAME/ID", "List attribute mappings associated with service link"
     # def list_attribute_mappings(context_params)
     #   post_body = Helper(:service_link).post_body_with_id_keys(context_params,method_argument_names)

data/lib/commands/thor/service_module.rb

@@ -214,7 +214,7 @@ module DTK::Client
     #   return response unless response.ok?
     #   module_name,repo_url,branch,version = response.data(:module_name,:repo_url,:workspace_branch,:version)
 
-    #   if error = response.data(:dsl_parsed_info)
+    #   if error = response.data(:dsl_parse_error)
     #     dsl_parsed_message = ServiceImporter.error_message("#{module_name}-#{version}", error)
     #     DTK::Client::OsUtil.print(dsl_parsed_message, :red)
     #   end
@@ -533,6 +533,12 @@ module DTK::Client
       push_dtkn_module_aux(context_params, internal_trigger)
     end
 
+    desc "SERVICE-MODULE-NAME/ID list-diffs", "List diffs between module on server and remote repo"
+    method_option :remote, :type => :boolean, :default => false
+    def list_diffs(context_params)
+      list_remote_module_diffs(context_params)
+      # list_diffs_module_aux(context_params)
+    end
 
     # desc "delete SERVICE-MODULE-NAME [-v VERSION] [-y] [-p]", "Delete service module or service module version and all items contained in it. Optional parameter [-p] is to delete local directory."
     # version_method_option

data/lib/commands/thor/test_module.rb

@@ -218,10 +218,11 @@ module DTK::Client
     end
     PushCatalogs = ["origin", "dtkn"]
 
-    desc "TEST-MODULE-NAME/ID list-diffs [--remote]", "List diffs"
+    desc "TEST-MODULE-NAME/ID list-diffs", "List diffs between module on server and remote repo"
     method_option :remote, :type => :boolean, :default => false
     def list_diffs(context_params)
-      list_diffs_module_aux(context_params)
+      list_remote_module_diffs(context_params)
+      # list_diffs_module_aux(context_params)
     end
 
 

data/lib/config/client.conf.header

@@ -12,6 +12,7 @@ verbose_rest_calls=false          # logging of REST calls
 module_location=component_modules
 service_location=service_modules
 test_module_location=test_modules
+backups_location=backups
 
 # server connection details
 server_port=80

data/lib/config/default.conf

@@ -13,3 +13,4 @@ verbose_rest_calls=false          # logging of REST calls
 module_location=component_modules
 service_location=service_modules
 test_module_location=test_modules
+backups_location=backups

data/lib/configurator.rb

@@ -83,6 +83,7 @@ module DTK
         FileUtils.mkdir(OsUtil.component_clone_location) unless File.directory?(OsUtil.component_clone_location)
         FileUtils.mkdir(OsUtil.service_clone_location) unless File.directory?(OsUtil.service_clone_location)
         FileUtils.mkdir(OsUtil.test_clone_location) unless File.directory?(OsUtil.test_clone_location)
+        FileUtils.mkdir(OsUtil.backups_location) unless File.directory?(OsUtil.backups_location)
       end
 
 

data/lib/domain/git_adapter.rb

@@ -7,7 +7,9 @@ module DTK
 
       def initialize(repo_dir, local_branch_name = nil)
         @git_repo = Git.init(repo_dir)
-        @local_branch_name = local_branch_name 
+#       If we want to log GIT interaction
+#       @git_repo = Git.init(repo_dir, :log => Logger.new(STDOUT))
+        @local_branch_name = local_branch_name
       end
 
       def changed?
@@ -25,7 +27,7 @@ module DTK
             @git_repo.remove(file)
           rescue
             # ignore this error means file has already been staged
-            # we cannot support status of file, in 1.8.7 so this is 
+            # we cannot support status of file, in 1.8.7 so this is
             # solution for that
           end
         end
@@ -59,6 +61,21 @@ module DTK
         end
       end
 
+      def diff_remote_summary(local_branch, remote_reference)
+        branch_local_obj  = @git_repo.branches.local.find { |b| b.name == local_branch }
+        branch_remote_obj = @git_repo.branches.remote.find{|r| "#{r.remote}/#{r.name}" == remote_reference }
+
+        if branch_local_obj && branch_remote_obj
+            difference = @git_repo.lib.diff_full(branch_remote_obj, branch_local_obj)
+            # difference = @git_repo.diff(branch_remote_obj, branch_local_obj)
+          {
+            :diffs => difference
+          }
+        else
+          raise Error.new("Error finding branches: local branch '#{local_branch}' (found: #{!branch_local_obj.nil?}), remote branch '#{remote_reference}' (found: #{!branch_remote_obj.nil?})")
+        end
+      end
+
       def local_summary()
         {
           :files_added => (untracked() + added()).collect { |file| { :path => file }},
@@ -117,24 +134,24 @@ module DTK
         ref_remote, ref_branch = ref.split('/')
         # fetch remote branch
         fetch(ref_remote) if opts[:fetch_if_needed]
-        
+
 
         git_reference = case type
           when :remote_branch
-            @git_repo.branches.remote.find { |r| "#{r.remote}/#{r.name}" == ref } 
+            @git_repo.branches.remote.find { |r| "#{r.remote}/#{r.name}" == ref }
           when :local_branch
             # DEBUG SNIPPET >>>> REMOVE <<<<
             #  TODO: HARIS LOOK INTO THIS
             # raise "Invalid ref #{ref}"
             @git_repo.branches.find { |b| b.name == ref }
-          else 
-            raise Error.new("Illegal type parameter (#{type}) passed to merge_relationship") 
+          else
+            raise Error.new("Illegal type parameter (#{type}) passed to merge_relationship")
         end
 
         local_sha = ret_local_branch.gcommit.sha
 
         opts[:ret_commit_shas][:local_sha] = local_sha if opts[:ret_commit_shas]
-      
+
         unless git_reference
           return :no_remote_ref if type.eql?(:remote_branch)
 
@@ -162,7 +179,7 @@ module DTK
         remote, remote_branch = remote_branch_ref.split('/')
         push_with_remote(remote, remote_branch)
       end
-      
+
       def push_with_remote(remote, remote_branch)
         branch_for_push = "#{local_branch_name}:refs/heads/#{remote_branch||local_branch_name}"
         @git_repo.push(remote, branch_for_push)
@@ -197,16 +214,16 @@ module DTK
         unless branch.nil?
           if opts[:track_remote_branch]
             # This just tracks remote branch
-            begin 
+            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; 
+            # This wil first create a remote branch;
             # TODO: this might be wrong and should be deprecated
-            git_base.branch(branch).checkout 
+            git_base.branch(branch).checkout
           end
         end
           git_base
@@ -268,7 +285,7 @@ module DTK
           ret = yield
          rescue => e
           unless e.respond_to?(:message)
-            raise e 
+            raise e
           else
             err_msg = e.message
             lines = err_msg.split("\n")
@@ -276,7 +293,7 @@ module DTK
               err_msg = error_msg_when_git_error(lines)
             end
             raise DtkError.new(err_msg)
-          end 
+          end
         end
         ret
       end

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.6.7"
+  VERSION="0.6.8"
 end

data/lib/util/module_util.rb

@@ -36,6 +36,10 @@ module DTK
         DtkLogger.instance.debug(caller)
         raise DtkError, "Module name should be in following format NAMESPACE#{NAMESPACE_SEPERATOR}MODULE_NAME" unless module_identifier.match(Regexp.new("^.+#{NAMESPACE_SEPERATOR}.+$"))
       end
+
+      def self.type_to_sym(module_type_s)
+        module_type_s.to_s.gsub!(/\_/,'-').to_sym
+      end
     end
   end
 end

data/lib/util/os_util.rb

@@ -161,6 +161,12 @@ module DTK
           clone_base_path(:assembly_module)
         end
 
+        def backups_location()
+          path = Config[:backups_location]
+          final_path = path && path.start_with?('/') ? path : "#{dtk_local_folder}#{path}"
+          final_path.gsub(/\/$/,'')
+        end
+
         def clone_base_path(module_type)
 
           path =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,8 +218,10 @@ files:
 - lib/commands/common/thor/inventory_parser.rb
 - lib/commands/common/thor/list_diffs.rb
 - lib/commands/common/thor/module.rb
+- lib/commands/common/thor/module/import.rb
 - lib/commands/common/thor/pull_clone_changes.rb
 - lib/commands/common/thor/pull_from_remote.rb
+- lib/commands/common/thor/puppet_forge.rb
 - lib/commands/common/thor/purge_clone.rb
 - lib/commands/common/thor/push_clone_changes.rb
 - lib/commands/common/thor/push_to_remote.rb