dtk-client 0.10.0 → 0.10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63474c8dc3c49c71f705cc21ff398b64f72adac4
-  data.tar.gz: d54921f4093a817ecfc2d8f58766ab34e6b949af
+  metadata.gz: 27c7da3e73bf4e15f1588363817bf3d31cce7eaa
+  data.tar.gz: 9b67c4994a0f8e4e4a2646fa18658f48d3c8a4f6
 SHA512:
-  metadata.gz: 50369f8f5f07e47c8edbb8c2eb257330dd4a0b02955fe507c8e958542ae3ccd85c65e33d49bb92679663f6efc69ff997cfcc052bed223dcda021fe713a0391ff
-  data.tar.gz: 5eeaa8383df1bc7e445c1a29ac1af5f6236cbe97929abc06706d16ab53e97ffc6b1d9d663563c45cfd8e279cd41f80151796f41dcc54a334fe43e79be0e246ef
+  metadata.gz: ed1c406eec37ae5326c0ec53e022168b380f2cf0e95c91c49017726883a1a0058d1e86f14da84f707b375fec1a8a78fb9cc430c0e71bf43314e7ae321b286420
+  data.tar.gz: d00b0993f3c444c435f0f1ddd1d4c7f23aeda34761fd689694ea087140902edc607b3390f2079edc396379d4a7f30b72adc8617253a20d570ca50b8ecc3e5df5

data/dtk-client.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize', '0.7.7'
   spec.add_dependency 'git', '1.2.9'
   spec.add_dependency 'hirb', '0.7.3'
+  spec.add_dependency 'mime-types', '~> 2.99.3'
+  
 end

data/lib/cli/version.rb

@@ -1,7 +1,7 @@
 module DTK
   module Client
     module CLI
-      VERSION = '0.10.0'
+      VERSION = '0.10.0.1'
     end
   end
 end

data/lib/client/operation/client_module_dir/git_repo.rb

@@ -82,6 +82,13 @@ module DTK::Client
           response_data_hash(:target_repo_dir => Internal.pull_from_remote(args))
         end
       end
+      
+      def self.add_file(args)
+        wrap_operation(args) do |args| 
+          response_data_hash(:repo => Internal.add_file(args)) 
+        end
+        
+      end
 
       def self.pull_from_service_repo(args)
         wrap_operation(args) do |args| 
@@ -276,6 +283,30 @@ module DTK::Client
           repo.pull(Dtkn::GIT_REMOTE, remote_branch)
         end
         
+        def self.add_file(args)
+          all_backup_file_paths = args.required(:backup_files).keys
+          final_path = args.required(:final_path)
+          if File.exists?(file_path = "#{final_path}/.gitignore")
+           has_backup = false
+           file = File.open(file_path, "r") do |f|
+             f.each_line do |line|
+               unless all_backup_file_paths.include?(line.strip)
+                 write = File.open(file_path, "a")
+                 write << line
+               end
+             end
+           end
+          else
+           File.open(".gitignore", "w") do |f|
+            all_backup_file_paths.each {|el| f.puts("#{el}\n")}
+           end
+          end
+          args[:backup_files].each_pair do |file_path, content|
+            File.open("#{final_path}/#{file_path}", "w") {|f| f.write(content)}
+            File.open("#{final_path}/dtk.service.yaml", "w") {|f| f.write(content)}
+          end
+        end
+
         def self.git_repo
           ::DTK::Client::GitRepo
         end

data/lib/client/operation/module/install.rb

@@ -43,8 +43,9 @@ module DTK::Client
         end
 
         unless dependent_modules.empty?
-          OsUtil.print_info('Auto-importing missing dependencies')
+          OsUtil.print_info('Auto-importing dependencies')
           ExternalModule.install_dependent_modules(dependent_modules)
+          OsUtil.print_info("Successfully imported '#{@base_module_ref.namespace}:#{@base_module_ref.module_name}' version #{@base_module_ref.version}")
         end
 
         CommonModule.install(@base_module_ref, @file_obj)

data/lib/client/operation/service/commit_and_push.rb

@@ -70,36 +70,12 @@ module DTK::Client
       def self.process_backup_files(response, opts = {})
         backup_files = response.data(:backup_files) || {}
         return if backup_files.empty?
-
         service_instance_name = opts[:service_instance]
-        final_path = "#{OsUtil.dtk_local_folder}/service/#{service_instance_name}"
-        all_backup_file_paths = backup_files.keys
-
-        if File.exists?(file_path = "#{final_path}/.gitignore")
-         has_backup = false
-         file = File.open(file_path, "r") do |f|
-           f.each_line do |line|
-             unless all_backup_file_paths.include?(line.strip)
-               write = File.open(file_path, "a")
-               write << line
-             end
-           end
-         end
-        else
-         File.open(".gitignore", "w") do |f|
-          all_backup_file_paths.each {|el| f.puts("#{el}\n")}
-         end
-        end
+        final_path = "#{OsUtil.dtk_local_folder}/#{service_instance_name}" 
+        
+        ClientModuleDir::GitRepo.add_file(:backup_files => backup_files, :final_path => final_path)
 
-        backup_files.each_pair do |file_path, content|
-          File.open("#{final_path}/#{file_path}", "a") {|f| f.write(content)}
-          File.open("#{final_path}/dtk.service.yaml", "w") {|f| f.write(content)}
-          # TODO: DTK-2663; write code that saves the content given by 'content' under 'file_path' which is a path relative to the service instance module. 
-        end
         response = ClientModuleDir::GitRepo.commit_and_push_to_service_repo(opts[:args]) 
-
-        # TODO: DTK-2663; write code that creates or updates .gitignore so that each file in all_backup_file_paths is aline in gitignore
-        # TODO: write code that commits these changes to the service instance module.  
       end
 
       def self.process_semantic_diffs(response)
@@ -108,7 +84,8 @@ module DTK::Client
         # TODO: DTK-2663; cleanup so pretty printed'
         OsUtil.print_info("\nDiffs that were pushed:")
         # TODO: get rid of use of STDOUT
-        STDOUT << hash_to_yaml(semantic_diffs).gsub("---\n", "")
+        #STDOUT << hash_to_yaml(semantic_diffs).gsub("---\n", "")
+        OsUtil.print(hash_to_yaml(semantic_diffs).gsub("---\n", ""))
       end
 
       PRINT_FN = {

data/lib/client/operation/service/ssh.rb

@@ -108,9 +108,9 @@ module DTK::Client
           raise Error::Usage, "No public key access or PEM provided, please grant access or provide valid PEM key"
         end
 
-        OsUtil.print("You are entering SSH terminal (#{connection_string}) ...", :yellow)
+        OsUtil.print_info("You are entering SSH terminal (#{connection_string}) ...")
         Kernel.system(ssh_command)
-        OsUtil.print("You are leaving SSH terminal, and returning to DTK Shell ...", :yellow)
+        OsUtil.print_info("You are leaving SSH terminal, and returning to DTK Shell ...")
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.0.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.99.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.99.3
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables: