dtk-client 0.10.2 → 0.10.3

data/lib/client/git_repo/adapter/git_gem.rb

@@ -74,6 +74,11 @@ module DTK::Client
         @git_repo.push(remote, branch_for_push, opts)
       end
 
+      def push_from_cached_branch(remote, branch, opts = {})
+        branch_for_push = "HEAD:#{branch}"
+        @git_repo.push(remote, branch_for_push, opts)
+      end
+
       def merge(branch_to_merge_from)
         @git_repo.merge(branch_to_merge_from)
       end
@@ -99,14 +104,24 @@ module DTK::Client
       end
 
       def stage_and_commit(commit_msg = nil)
+        commit_msg ||= default_commit_message
         add_all
         begin
-          commit(commit_msg || "DTK Commit from client")
+          commit(commit_msg)
         rescue
           # do not raise if nothing to commit
         end
       end
 
+      def empty_commit(commit_msg = nil)
+        commit_msg ||= default_commit_message
+        commit(commit_msg, :allow_empty => true)
+      end
+
+      def reset_soft(sha)
+        @git_repo.reset(sha)
+      end
+        
       def stage_changes()
         handle_git_error do
           @git_repo.add(untracked())
@@ -124,8 +139,10 @@ module DTK::Client
         end
       end
 
-      def commit(commit_msg = "")
-        @git_repo.commit(commit_msg)
+      # opts can have keys
+      #   :allow_empty
+      def commit(commit_msg = "", opts = {})
+        @git_repo.commit(commit_msg, :allow_empty => opts[:allow_empty])
       end
 
       def add(*files)
@@ -164,7 +181,23 @@ module DTK::Client
         (!(changed().empty? && untracked().empty? && deleted().empty?))
       end
 
-      def print_status
+      # opts can have keys:
+        #   :with_diffs (Boolean)
+      def print_status(opts = {})
+        if opts[:with_diffs]
+          print_status_with_diffs
+        else
+          print_status_simple
+        end
+      end
+
+      def all_branches
+        @git_repo.branches
+      end
+
+      private
+
+      def print_status_simple
         changes = [changed(), untracked(), deleted()]
         puts "\nModified files:\n".colorize(:green) unless changes[0].empty?
         changes[0].each { |item| puts "\t#{item}" }
@@ -174,6 +207,31 @@ module DTK::Client
         changes[2].each { |item| puts "\t#{item}" }
         puts "" 
       end
+
+      def print_status_with_diffs
+        changes = [changed(), untracked(), deleted()]
+        puts "\nThere are changes that are not pushed to the server that will not be staged:\n".colorize(:green) unless changes[0].empty?
+        diff = @git_repo.diff.stats[:files]
+        file_changed = changes[0].size
+        deletions = 0
+        insertions = 0
+        changes[0].each do |item|
+          deletions += diff[item][:deletions]
+          insertions += diff[item][:insertions]  
+          puts "\t#{item} | #{insertions + deletions} " + "+".colorize(:green) * insertions + "-".colorize(:red) * deletions
+        end
+        puts "\t#{file_changed} file changed, #{deletions} deletions(-), #{insertions} insertions(+)"
+        puts "\nAdded files:\n".colorize(:yellow) unless changes[1].empty?
+        changes[1].each { |item| puts "\t#{item}" }
+        puts "\nDeleted files:\n".colorize(:red) unless changes[2].empty?
+        changes[2].each { |item| puts "\t#{item}" }
+        puts "" 
+      end
+
+      def default_commit_message
+        "DTK Commit from client"
+      end
+
     end
   end
 end

data/lib/client/git_repo.rb

@@ -57,6 +57,19 @@ module DTK::Client
       end
     end
 
+    def self.modified_with_diff?(dir, opts = {})
+      repo_dir = {
+        :path    => dir,
+        :branch  => Git.open(dir).branches.local
+      }
+
+      message = DTK::Client::Operation::ClientModuleDir::GitRepo.modified_with_diff(repo_dir)
+      if message.data(:modified)
+        error_msg = opts[:error_msg] || "To allow push to go through, use option '-f' or invoke 'dtk push' to push the changes before invoking stage again"
+        raise Error::Usage, error_msg
+      end
+    end
+
     def add_remote(name, url)
       @git_adapter.add_remote(name, url)
     end
@@ -95,14 +108,20 @@ module DTK::Client
       @git_adapter.merge(branch_to_merge_from)
     end
 
-    def print_status
-      @git_adapter.print_status
+    # opts can have keys:
+    #   :with_diffs (Boolean)
+    def print_status(opts = {})
+      @git_adapter.print_status(opts)
     end
 
     def push(remote, branch, opts = {})
       @git_adapter.push(remote, branch, opts)
     end
 
+    def push_from_cached_branch(remote, branch, opts = {})
+      @git_adapter.push_from_cached_branch(remote, branch, opts)
+    end
+
     def pull(remote, branch)
       @git_adapter.pull(remote, branch)
     end
@@ -119,6 +138,18 @@ module DTK::Client
       @git_adapter.stage_and_commit(commit_msg)
     end
 
+    def empty_commit(commit_msg = nil)
+      @git_adapter.empty_commit(commit_msg)
+    end
+
+    def reset_soft(sha)
+      @git_adapter.reset_soft(sha)
+    end
+
+    def all_branches
+      @git_adapter.all_branches
+    end
+
     private
     
     def git_adapter_class

data/lib/client/load_source/component_info.rb

@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class LoadSource
+    class ComponentInfo < self
+      def fetch_and_cache_info
+        fetch_remote
+        merge_from_remote
+        transform_from_component_info
+      end
+
+      def fetch_info
+        fetch_remote
+      end
+      
+      private
+      
+      def self.info_type
+        :component_info
+      end
+      
+      def transform_from_component_info
+        info_processor.read_inputs_and_compute_outputs!
+        info_processor.input_file_paths.map { |path| Operation::ClientModuleDir.rm_f(path) }
+      end
+
+    end
+  end
+end

data/lib/client/load_source/service_info.rb

@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class LoadSource
+    class ServiceInfo < self
+      def fetch_and_cache_info
+        fetch_remote
+        merge_from_remote
+        transform_from_service_info
+      end
+
+      def fetch_info
+        fetch_remote
+      end
+      
+      private
+      
+      def self.info_type
+        :service_info
+      end
+      
+      def transform_from_service_info
+        info_processor.read_inputs_and_compute_outputs!
+        
+        # delete old files
+        # Assumed that this is done before ComponentInfo.transform_from_service_info
+        Operation::ClientModuleDir.delete_directory_content(target_repo_dir)
+      end
+      
+    end
+  end
+end

data/lib/client/load_source.rb

@@ -0,0 +1,148 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class LoadSource
+    require_relative('load_source/service_info')
+    require_relative('load_source/component_info')
+
+    def initialize(transform_helper, info_type, remote_repo_url, parent)
+      @info_processor   = transform_helper.info_processor(info_type)
+      @info_type        = info_type
+      @remote_repo_url  = remote_repo_url
+      @target_repo_dir  = parent.target_repo_dir
+      @version          = parent.version
+    end
+    private :initialize
+
+    # opts can have keys
+    #   :stage_and_commit_steps - used to stage and commit every step for pull-dtkn
+    def self.fetch_transform_and_merge(remote_module_info, parent, opts = {})
+      target_repo_dir      = parent.target_repo_dir
+      transform_helper     = ServiceAndComponentInfo::TransformFrom.new(target_repo_dir, parent.module_ref, parent.version)
+      info_types_processed = []
+
+      if service_info = remote_module_info.data(:service_info)
+        ServiceInfo.fetch_and_cache_info(transform_helper, service_info['remote_repo_url'], parent)
+        info_types_processed << ServiceInfo.info_type
+        stage_and_commit(target_repo_dir, commit_msg(info_types_processed)) if opts[:stage_and_commit_steps]
+      end
+
+      if component_info = remote_module_info.data(:component_info)
+        ComponentInfo.fetch_and_cache_info(transform_helper, component_info['remote_repo_url'], parent)
+        info_types_processed << ComponentInfo.info_type
+      end
+
+      unless info_types_processed.empty?
+        transform_helper.output_path_text_pairs.each_pair do |path, text_content|
+          Operation::ClientModuleDir.create_file_with_content("#{target_repo_dir}/#{path}", text_content)
+        end
+        stage_and_commit(target_repo_dir, commit_msg(info_types_processed))
+      end
+    end
+
+    def self.fetch_and_cache_info(transform_helper, remote_repo_url, parent)
+      new(transform_helper, info_type, remote_repo_url, parent).fetch_and_cache_info
+    end
+
+    def self.fetch_from_remote(remote_module_info, parent, opts = {})
+      target_repo_dir  = parent.target_repo_dir
+
+      # if remotes added do not add them again
+      branches = Operation::ClientModuleDir::GitRepo.all_branches(:path => target_repo_dir).data(:branches)
+      remote_branches = branches.select { |branch| branch.full.include?('dtkn') || branch.full.include?('dtkn-component-info') }
+
+      return unless remote_branches.empty?
+
+      transform_helper = ServiceAndComponentInfo::TransformFrom.new(target_repo_dir, parent.module_ref, parent.version)
+
+      if service_info = remote_module_info.data(:service_info)
+        srv_info = ServiceInfo.new(transform_helper, ServiceInfo.info_type, service_info['remote_repo_url'], parent)
+        srv_info.fetch_info
+      end
+
+      if component_info = remote_module_info.data(:component_info)
+        cmp_info = ComponentInfo.new(transform_helper, ComponentInfo.info_type, component_info['remote_repo_url'], parent)
+        cmp_info.fetch_info
+      end
+
+      nil
+    end
+    
+    private
+
+    attr_reader :info_processor, :target_repo_dir
+
+    def self.write_output_path_text_pairs(transform_helper, target_repo_dir, info_types_processed)
+    end
+
+    def common_git_repo_args
+       {
+        :info_type => @info_type,
+        :repo_dir  => @target_repo_dir
+      }
+    end
+
+    def git_repo_remote_branch
+      (@version && !@version.eql?('master')) ? "v#{@version}" : 'master'
+    end
+
+    def fetch_remote
+      git_repo_args = common_git_repo_args.merge(:add_remote => @remote_repo_url)
+      git_repo_operation.fetch_dtkn_remote(git_repo_args)
+    end
+
+    def merge_from_remote
+      git_repo_args = common_git_repo_args.merge(:remote_branch => git_repo_remote_branch, :no_commit => true)
+      git_repo_operation.merge_from_dtkn_remote(git_repo_args)
+    end
+
+    def self.stage_and_commit(target_repo_dir, commit_msg = nil)
+      git_repo_args = {
+        :repo_dir          => target_repo_dir,
+        :commit_msg        => commit_msg,
+        :local_branch_type => :dtkn
+      }
+      git_repo_operation.stage_and_commit(git_repo_args)
+    end
+
+    def self.commit_msg(info_types_processed)
+      msg = "Added "
+      count = 0
+      types = info_types_processed #info
+      if types.include?(ServiceInfo.info_type)
+        msg << 'service '
+        count +=1
+      end
+      if types.include?(ComponentInfo.info_type)
+        msg << 'and ' if count > 0
+        msg << 'component'
+        count +=1
+      end
+      msg << 'info'
+      msg
+    end
+
+    def self.git_repo_operation
+      Operation::ClientModuleDir::GitRepo
+    end
+
+    def git_repo_operation
+      self.class.git_repo_operation
+    end
+  end
+end

data/lib/client/{util/module_ref.rb → module_ref.rb}

@@ -19,6 +19,7 @@ module DTK::Client
   class ModuleRef
 
     attr_reader :namespace, :module_name, :version, :client_dir_path
+    attr_accessor :version
 
     # opts can have keys
     #  :namespace
@@ -41,10 +42,28 @@ module DTK::Client
       @client_dir_path = opts[:client_dir_path]
     end
 
+    def pretty_print
+      ::DTK::Common::PrettyPrintForm.module_ref(@module_name, :namespace => @namespace, :version => @version)
+    end
+    # TODO: look at deprecating print_form
     def print_form
       NamespaceModuleName.print_form(@namespace, @module_name, :version => @version)
     end
 
+    MASTER_VERSION = 'master'
+    def is_master_version?
+      @version.nil? or @version == MASTER_VERSION
+    end
+
+    def same_module?(module_ref)
+      @module_name == module_ref.module_name 
+    end
+      
+    def exact_match?(module_ref)
+      same_module?(module_ref) and @namespace == module_ref.namespace and @version == module_ref.version
+    end
+
+
     private
 
     module NamespaceModuleName

data/lib/client/operation/account/add_ssh_key.rb

@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Account
+    class AddSshKey < self
+      def self.execute(args = Args.new)
+        path_to_key = args[:directory_path] unless args[:directory_path].nil?
+        path_to_key ||= SSHUtil.default_rsa_pub_key_path()
+
+        opts = {
+          :name => args[:name]
+        }
+
+        response, matched, matched_username = Account.add_key(path_to_key, opts)
+
+        if matched
+          OsUtil.print("Provided SSH pub key has already been added.", :yellow)
+        elsif matched_username
+          OsUtil.print("User ('#{matched_username}') already exists.", :yellow)
+        else
+          Configurator.add_current_user_to_direct_access() if response.ok?
+        end
+
+        if response.ok? && response.data(:repoman_registration_error)
+          OsUtil.print("Warning: We were not able to register your key with remote catalog! #{response.data(:repoman_registration_error)}", :yellow)
+        end
+
+        response.ok? ? nil : response
+      end
+      end
+    end
+  end

data/lib/client/operation/account/delete_ssh_key.rb

@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Account
+    class DeleteSshKey < self
+      def self.execute(args = Args.new)
+        name = args[:name]
+        unless args[:skip_prompt]
+          is_go = DTK::Client::Console.prompt_yes_no("Are you sure you want to delete SSH key '#{name}'"+"?")
+          return nil unless is_go
+        end
+        post_body = {
+          :username => name
+        }
+        response = rest_post("#{RoutePrefix}/delete_ssh_key", post_body)
+        return response unless response.ok?
+
+        if response.ok? && response.data(:repoman_registration_error)
+          OsUtil.print("Warning: We were not able to unregister your key with remote catalog! #{response.data(:repoman_registration_error)}", :yellow)
+        end
+
+        OsUtil.print("SSH key '#{name}' removed successfully!", :yellow)
+      end
+    end
+  end
+end

data/lib/client/operation/account/list_ssh_keys.rb

@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Account
+    class ListSshKeys < self
+      def self.execute(args = Args.new)
+        post_body = { :username => Configurator.client_username }
+        response = rest_get("#{RoutePrefix}/list_ssh_keys", post_body)
+        response.set_render_as_table!
+      end
+      end
+    end
+  end

data/lib/client/operation/account/register_catalog_user.rb

@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Account
+    class RegisterCatalogUser < self
+      def self.execute(args = Args.new)
+        body_params = DTK::Client::InteractiveWizard.interactive_user_input([
+       {:username => { :required => true} },
+       {:password => { :type => :password }},
+       {:repeat_password => { :type => :repeat_password }},
+       {:email => { :type => :email, :required => true }},
+       {:first_name => {}},
+       {:last_name => {}}
+      ])
+      OsUtil.print("Creating account please wait ...", :white)
+
+      response = rest_post("#{RoutePrefix}/register_catalog_account", body_params) 
+
+      if response.ok?
+        OsUtil.print("You have successfully created catalog account!", :green)
+        if DTK::Client::Console.prompt_yes_no("Do you want to make this account active?")
+          post_body =  { :username => body_params[:username], :password => body_params[:password], :validate => true }
+          response = rest_post("#{RoutePrefix}/set_catalog_credentials", post_body)
+          OsUtil.print("Catalog user '#{body_params[:username]}' is currently active user!", :green)
+        end
+      else
+        return response
+      end
+
+      nil
+      end
+    end
+  end
+end

data/lib/client/operation/account/set_catalog_credentials.rb

@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Account
+    class SetCatalogCredentials < self
+      def self.execute(args = Args.new)
+        creds = DTK::Client::Configurator.enter_catalog_credentials()
+
+        post_body = { :username => creds[:username], :password => creds[:password], :validate => true }
+        response = rest_post("#{RoutePrefix}/set_catalog_credentials", post_body)
+        return response unless response.ok?
+
+        OsUtil.print("Your catalog credentials have been set!", :yellow)  
+      end
+    end
+  end
+end