dtk-client 0.9.1 → 0.10.0

data/bin/dtk-shell

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-#
-# 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.
-#
-require File.expand_path('../lib/shell', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/account', File.dirname(__FILE__))
-
-trap("INT", "SIG_IGN")
-
-config_exists = ::DTK::Client::Configurator.check_config_exists
-::DTK::Client::Configurator.check_git
-::DTK::Client::Configurator.create_missing_clone_dirs
-
-# check if .add_direct_access file exists, if not then add direct access and create .add_direct_access file
-resolve_direct_access(::DTK::Client::Configurator.check_direct_access, config_exists)
-
-run_shell_command()

data/lib/auxiliary.rb

@@ -1,61 +0,0 @@
-#
-# 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
-  module Client
-    module Auxiliary
-      def cap_form(x)
-        x.gsub('-','_').to_s.split("_").map{|t|t.capitalize}.join("")
-      end
-
-      def snake_form(command_class,seperator="_")
-        command_class.to_s.gsub(/^.*::/, '').gsub(/Command$/,'').scan(/[A-Z][a-z]+/).map{|w|w.downcase}.join(seperator)
-      end
-    end
-
-    class PostBody < Hash
-      def initialize(raw={})
-        super()
-        unless raw.empty?
-          replace(convert(raw))
-        end
-      end
-      def merge(raw)
-        super(convert(raw))
-      end
-      def merge!(raw)
-        super(convert(raw))
-      end
-
-     private
-      def convert(raw)
-        raw.inject(Hash.new) do |h,(k,v)|
-          if non_null_var = is_only_non_null_var?(k)
-            v.nil? ? h : h.merge(non_null_var => v)
-          else
-            h.merge(k => v)
-          end
-        end
-      end
-      def is_only_non_null_var?(k)
-        if k.to_s =~ /\?$/
-          k.to_s.gsub(/\?$/,'').to_sym
-        end
-      end
-    end
-  end
-end

data/lib/client.rb

@@ -1,58 +0,0 @@
-#
-# 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.
-#
-require 'rubygems'
-
-begin
-  require File.expand_path("require_first", File.dirname(__FILE__))
-
-  if gem_only_available?
-    # loads it only if there is no common folder, and gem is installed
-    require 'dtk_common_core'
-  end
-
-  # Load DTK Common
-  dtk_require_dtk_common_core("dtk_common_core")
-
-  # Monkey Patching bundler to support loading specific Gemfile from dtk-client project's root - Ticket: DTK-585
-  dtk_require("config/configuration")
-
-  # 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
-  unless DTK::Configuration.get(:development_mode)
-    require 'bundler'
-    #TODO: rich temp hack becaus eof problem with gem dependencies; changed this because it was not working in 0.19.0
-    if Bundler.respond_to?(:start)
-      Bundler.start
-    end
-    dtk_require("bundler_monkey_patch")
-  end
-
-  ########
-  dtk_require("auxiliary")
-  dtk_require("core")
-  dtk_require("error")
-  dtk_require("dtk_constants")
-  dtk_require("commands")
-  dtk_require("view_processor")
-  dtk_require("search_hash")
-  dtk_require("dtk_logger")
-rescue SystemExit, Interrupt
-  #puts "DTK Client action canceled."
-  exit(1)
-end

data/lib/command_helper.rb

@@ -1,33 +0,0 @@
-#
-# 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; module Client
-  module CommandHelperMixin
-    def Helper(helper_class_name)
-      unless Loaded[helper_class_name]
-        dtk_nested_require('command_helpers',helper_class_name)
-        Loaded[helper_class_name] = true
-      end
-      CommandHelper.const_get Common::Aux.snake_to_camel_case(helper_class_name.to_s)
-    end
-    Loaded = Hash.new
-  end              
-
-  #TODO: make all commands helpers a subclass of this
-  class CommandHelper              
-  end
-end; end

data/lib/command_helpers/git_repo/merge.rb

@@ -1,153 +0,0 @@
-#
-# 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; module Client; class CommandHelper
-  class GitRepo
-    class Merge
-
-      def initialize(repo, remote_branch_ref, opts = {})
-        @repo              = repo
-        @remote_branch_ref = remote_branch_ref
-        @local_branch      = repo.local_branch_name
-        
-        # options
-        @opts_commit_sha = opts[:commit_sha]
-        @opts_force = opts[:force]
-        @opts_ignore_dependency_merge_conflict = opts[:ignore_dependency_merge_conflict]
-        @opts_full_module_name = opts[:full_module_name]
-        @opts_command = opts[:command]
-      end
-      
-      def self.merge(repo, remote_branch_ref, opts = {})
-        new(repo, remote_branch_ref, opts).merge
-      end
-
-      def merge
-        if @opts_force
-          merge_force()
-        else
-          # check if merge needed
-          merge_rel = merge_relationship()
-          case merge_rel
-           when :equal 
-            response__no_diffs()
-           when :local_ahead, :branchpoint
-            merge_not_fast_forward(merge_rel)
-           when :local_behind
-            merge_simple()
-           else
-            raise Error.new("Unexpected merge_rel (#{merge_rel})")
-          end
-        end
-      end
-
-      private
-      
-      def merge_force
-        diffs = compute_diffs()
-        # TODO: should put in a commit message that merged from remote repo
-        @repo.merge_theirs(@remote_branch_ref)
-        response(diffs)
-      end
-      
-      def merge_not_fast_forward(merge_rel)
-        if any_conflicts?
-          # @opts_ignore_dependency_merge_conflict means called indirectly
-          if @opts_ignore_dependency_merge_conflict
-            # TODO: hard-wired that dependency is a component module in message: 'component-module/..
-            custom_message = "Unable to do fast-forward merge. You can go to 'component-module/#{@opts_full_module_name}' and pull with --force option but all local changes will be lost." 
-            response(compute_diffs, :custom_message => custom_message)
-          else
-            err_msg = 'Unable to do fast-forward merge. You can use --force'
-            err_msg << " on #{@opts_command}" if @opts_command
-            err_msg <<  ', but all local changes will be lost on target that is being pushed to.'
-            raise ErrorUsage.new(err_msg)
-          end
-        elsif  merge_rel == :local_ahead
-          response__no_diffs(:custom_message => 'No op because local module is ahead')
-        else
-          merge_simple()
-        end
-      end
-
-      def merge_simple
-        # see if any diffs between fetched remote and local branch
-        # this has be done after commit
-        diffs = compute_diffs()
-        return diffs unless diffs.any_diffs?()
-        
-        safe_execute do
-          # TODO: should put in a commit message that merged from remote repo
-          @repo.merge(@remote_branch_ref)
-        end
-        
-        if commit_sha = @opts_commit_sha
-          if commit_sha != @repo.head_commit_sha()
-            raise Error.new("Git synchronization problem: expected local head to have sha (#{commit_sha})")
-          end
-        end
-        
-        response(diffs)
-      end
-      
-      def merge_relationship
-        @repo.merge_relationship(:remote_branch, @remote_branch_ref)    
-      end
-      
-      def any_conflicts?
-        # TODO: optimization is to combine this with mereg to have merge_if_no_conflics? 
-        #       and if no conflicts just commit and merge --no-commit
-        ret = nil
-        begin
-          @repo.command('merge',['--no-commit', @remote_branch_ref])
-         rescue ::Git::GitExecuteError
-          ret = true
-        ensure
-          safe_execute do
-            @repo.command('merge',['--abort'])
-          end
-        end
-        ret
-      end
-
-      def response__no_diffs(opts_response = {})
-        response(diffs__no_diffs(), opts_response)
-      end
-
-      def response(diffs, opts_response = {})
-        { :diffs => diffs, :commit_sha => @repo.head_commit_sha() }.merge(opts_response)
-      end
-      
-      def diffs__no_diffs
-        GitRepo.diffs__no_diffs
-      end
-      
-      def compute_diffs
-        GitRepo.compute_diffs(@repo,  @remote_branch_ref)
-      end
-      
-      def safe_execute(&block)
-        begin
-          yield
-         rescue Exception
-          nil
-        end
-      end
-
-    end
-  end
-end; end; end