yadecli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44efa06d628222cc22d2209325595d1d989fd84d1cf4519606bf1f2a969835d
-  data.tar.gz: 57e0eb1a64a8c43d3968a9362b8dda2e01d0663a85621655a2d5b47beba0154a
+  metadata.gz: 755e7471d5c931bc8c2abcadca1105d3af78baa83d6734e6538927a69baaeea8
+  data.tar.gz: 02ab4f4bf68e6b718eeb95ceb5b91a2be4ce9f8382ab128149172baf3aaaf76f
 SHA512:
-  metadata.gz: 4cc1a89229a77be4f5ce1dc9e04bc226a91f81f0863bbd6f43e2514f68626358aefcd5b0eff3b8778244210a5aa6283695820a4507545c63ee09644ddd09f234
-  data.tar.gz: 74202ff8a40779cd487ff6fe0d409dcc8eeb4d3c511ca6d5e4116620bb0c42a0624eb9f73c30c84ec59d11e05f770ec67992e841c925157b27b379a86e8705b9
+  metadata.gz: 0517566cf487ebe02d971c6d7facfc7b42803f3b129b103c5f3357b0c2684e9cb845e64f018300d35838cb2eb51edccdc3bab0e7c20cdbb647c1c6fabb87d78a
+  data.tar.gz: 3c919b6af35b6e3ddf95d20c0f86f1a554262c21389e5ecd4a2c9befffeb2990b0785001b55d176d1a347c18fe51ac332e2928b4a31d7bf664d80740a78f0282

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    yadecli (0.1.1)
+    yadecli (0.1.2)
       activemodel (~> 5.2)
       artii (~> 2.1)
       colorize (~> 0.8)
       dotenv (~> 2.5)
+      gitlab (~> 3.6)
       httparty (~> 0.13)
       net-ssh (~> 5.0)
       rest-client (~> 2.0)
@@ -64,6 +65,9 @@ GEM
     equatable (0.5.0)
     ffi (1.9.25)
     gherkin (5.1.0)
+    gitlab (3.6.1)
+      httparty
+      terminal-table
     hitimes (1.3.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -119,9 +123,13 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
     settingslogic (2.0.9)
-    strings (0.1.2)
+    strings (0.1.3)
+      strings-ansi (~> 0.1.0)
       unicode-display_width (~> 1.4.0)
       unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.0)
     thread_safe (0.3.6)
     timers (4.1.2)

data/lib/yadecli.rb

@@ -49,6 +49,7 @@ require 'yadecli/client/sdk_package_client'
 require 'yadecli/client/rvm_runtime_client'
 require 'yadecli/client/nvm_runtime_client'
 require 'yadecli/client/pyenv_runtime_client'
+require 'yadecli/client/gitlab_client'
 require 'yadecli/service/connect_service'
 require 'yadecli/service/authentication_service'
 require 'yadecli/service/project_service'

data/lib/yadecli/cli/composer.rb

@@ -25,8 +25,8 @@ module Yadecli
       method_option :clean, default: false, aliases: '-c', desc: 'Clean install, will delete a existing composer project'
       method_option :yes, default: false, aliases: '-y', desc: 'Will answer yes to all questions, This will run a git pull on installed projects without asking'
       method_option :pull, default: false, aliases: '-p', desc: 'Will run a git pull on a already installed project'
-      def install(name)
-        Yadecli::Service::ComposerService.new.install(name, options)
+      def install(project_name, branch_name = nil)
+        Yadecli::Service::ComposerService.new.install(project_name, branch_name, options)
       end
 
       # switch branch command

data/lib/yadecli/client/gitlab_client.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'gitlab'
+
+# yadecli cli
+module Yadecli
+  module Client
+
+    # gitlab client
+    class GitlabClient
+
+      # request yade token
+      def initialize
+        Gitlab.configure do |config|
+          config.endpoint       = AppConfig[:git_api_url]   # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+          config.private_token  = AppConfig[:git_token]     # user's private token or OAuth2 access token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+        end
+
+        #Gitlab.http_proxy('squid.dzbw.de', 3128)
+      end
+
+      # get branch names from gitlab project given by name
+      def get_branch_names(repository_name)
+        projects = Gitlab.projects
+
+        project = projects.select { |p| repository_name == p.name }.first
+
+        branches = Gitlab.branches(project.id)
+
+        branches.map { |b| b.name }
+      end
+
+      # get branch names from gitlab project given by name
+      def get_default_branch(repository_name)
+        projects = Gitlab.projects
+
+        project = projects.select { |p| repository_name == p.name }.first
+
+        project.default_branch
+      end
+    end
+  end
+end

data/lib/yadecli/config/app_config.rb

@@ -59,6 +59,7 @@ curl --header 'PRIVATE-TOKEN: <your token>' \
     d['access_token'] = self.access_token
     d['refresh_token'] = self.refresh_token
     d['expiration_time'] = self.expiration_time
+    d['git_api_url'] = self.git_api_url
     d['git_username'] = self.git_username
     d['git_password'] = self.git_password
     d['git_token'] = self.git_token

data/lib/yadecli/io/user_input.rb

@@ -11,11 +11,11 @@ class UserInput
     prompt.ask(message, default: AppConfig[config_key] ||= '')
   end
 
-  # def self.select_branch(project_name)
-  #   prompt = TTY::Prompt.new
-  #
-  #   available_branches = GitlabApi.new.branches_of_project(project_name)
-  #
-  #   prompt.select('Select the branch you want to clone', available_branches.map { |b| b.to_hash['name'] })
-  # end
+  def self.select_branch(repo_name)
+    prompt = TTY::Prompt.new
+
+    branches = Yadecli::Client::GitlabClient.new.get_branch_names(repo_name)
+
+    prompt.select('Select the branch you want to clone', branches)
+  end
 end

data/lib/yadecli/model/composer_project.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_model'
+require 'uri'
 
 # Project
 class ComposerProject
@@ -27,4 +28,10 @@ class ComposerProject
   def uninstall
     FileUtils.rm_rf("#{AppConfig[:composer_home]}/#{name}")
   end
+
+  def git_repo_name
+    uri = URI(gitUrl)
+
+    uri.path.split('/').last.split('.').first
+  end
 end

data/lib/yadecli/model/project_module.rb

@@ -17,7 +17,7 @@ class ProjectModule
   end
 
   def home
-    project_client = Yadecli::Client::ProjectClient.new('yadeproject', 'project')
+    project_client = Yadecli::Client::ProjectClient.new
     project = project_client.get(projectId)
 
     "#{project.home}/src/#{name}"

data/lib/yadecli/service/composer_service.rb

@@ -42,7 +42,7 @@ module Yadecli
         composer_projects = @composer_project_client.list
 
         # print table
-        table = TTY::Table.new header: ['Id', 'Name', 'Services', 'Installed', 'Branch', 'Git Url']
+        table = TTY::Table.new header: ['Id', 'Name', 'Services', 'Installed', 'Branches', 'Git Url']
 
         # add as rows to table
         composer_projects.each do |p|
@@ -52,13 +52,31 @@ module Yadecli
 
           composer_services = @composer_service_client.get_by_composer_project_id(project_id)
           service_names = composer_services.collect(&:name).join(', ')
+
+          gitlab_client = Yadecli::Client::GitlabClient.new
+
+          branches = gitlab_client.get_branch_names(p.git_repo_name)
+          default_branch = gitlab_client.get_default_branch(p.git_repo_name)
+
           if project_installed
-            branch_name = FileUtil.git_current_branch(p.install_dir)
+            current_branch = FileUtil.git_current_branch(p.install_dir)
           else
-            branch_name = '-'
+            current_branch = nil
+          end
+
+          branches = branches.map do |b|
+            if b == default_branch && b == current_branch
+              "#{b} (Default, Current)"
+            elsif b == default_branch && b != current_branch
+              "#{b} (Default)"
+            elsif b == current_branch && b != default_branch
+                "#{b} (Current)"
+            else
+              b
+            end
           end
 
-          table << [project_id, project_name, service_names , project_installed, branch_name, p.gitUrl]
+          table << [project_id, project_name, service_names , project_installed, branches.join(', '), p.gitUrl]
         end
 
         renderer = TTY::Table::Renderer::ASCII.new(table, padding: [0, 1])
@@ -72,11 +90,11 @@ module Yadecli
       end
 
       # install composer project with name
-      def install(name, options)
+      def install(project_name, branch_name = nil, options)
         CliUtil.print_header('YadeCli Composer Install',
-                             ["Going to install Yade composer project #{name}", ''])
+                             ["Going to install Yade composer project #{project_name}", ''])
 
-        composer_project = @composer_project_client.get_by_name(name)
+        composer_project = @composer_project_client.get_by_name(project_name)
 
         #   # delete already installed when option --clean given
         #   uninstall(options, true) if options[:clean]
@@ -91,18 +109,18 @@ module Yadecli
         already_installed = composer_project.installed?
 
         # ask for branch if not given from commandline
-        # @branch = UserInput.select_branch(composer_project) if @branch == nil || (@name.nil? && !already_installed)
+        branch_name = UserInput.select_branch(composer_project.git_repo_name) if branch_name == nil && !already_installed && !options[:yes]
 
         if already_installed
-          puts "Composer project #{name} already installed.".colorize(color: :blue, mode: :bold)
+          puts "Composer project #{project_name} already installed.".colorize(color: :blue, mode: :bold)
           puts '  ↳ Doing a git pull.'
 
           pull_repository(composer_project, options)
         else
-          puts "Composer project #{name} will be installed.".colorize(color: :blue, mode: :bold)
+          puts "Composer project #{project_name} will be installed.".colorize(color: :blue, mode: :bold)
           puts '  ↳ Doing a git clone.'
 
-          clone_repository(composer_project)
+          clone_repository(composer_project, branch_name)
         end
 
         puts ''
@@ -344,7 +362,7 @@ module Yadecli
       end
 
       # clone repository
-      def clone_repository(composer_project)
+      def clone_repository(composer_project, branch_name)
         username = AppConfig[:git_username]
         password = AppConfig[:git_password]
 
@@ -357,7 +375,9 @@ module Yadecli
         url_with_auth = "#{scheme}://#{username}:#{password}@#{host}#{path}"
 
         cmd = TTY::Command.new(output: Yadecli.LOGGER)
-        cmdline = "git clone --depth=1 #{url_with_auth} #{composer_project.install_dir}"
+        cmdline = "git clone --depth=1 "
+        cmdline += "-b #{branch_name} " if branch_name != nil
+        cmdline += "#{url_with_auth} #{composer_project.install_dir}"
 
         cmd.run(cmdline, only_output_on_error: true)
       end

data/lib/yadecli/service/project_service.rb

@@ -37,9 +37,16 @@ module Yadecli
             is_installed = m.installed?
             git_status = '-'
             git_status = FileUtil.git_status(m.home) if is_installed
-            rows << [module_name, is_installed, git_status]
+
+            if is_installed
+              current_branch = FileUtil.git_current_branch(p.home)
+            else
+              current_branch = '-'
+            end
+
+            rows << [module_name, is_installed, git_status, current_branch]
           end
-          table = TTY::Table.new header: ['Module name', 'Installed', 'Git Status'], rows: rows
+          table = TTY::Table.new header: ['Module name', 'Installed', 'Git Status', 'Branch'], rows: rows
           puts table.render(:ascii, padding: [0, 1])
           puts ''
         end

data/lib/yadecli/version.rb

@@ -1,3 +1,3 @@
 module Yadecli
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/yadecli.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'artii', '~> 2.1'
   spec.add_dependency 'colorize', '~> 0.8'
   spec.add_dependency 'dotenv', '~> 2.5'
+  spec.add_dependency 'gitlab', '~> 3.6'
   spec.add_dependency 'httparty', '~> 0.13'
   spec.add_dependency 'net-ssh', '~> 5.0'
   spec.add_dependency 'rest-client', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yadecli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sebastian Freund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: gitlab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +311,7 @@ files:
 - lib/yadecli/client/composer_project_client.rb
 - lib/yadecli/client/composer_service_client.rb
 - lib/yadecli/client/domain_client.rb
+- lib/yadecli/client/gitlab_client.rb
 - lib/yadecli/client/host_client.rb
 - lib/yadecli/client/maven_build_step_client.rb
 - lib/yadecli/client/maven_build_task_client.rb