obs_deploy 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f5719e3a953c7cabd13373bb9671b6f9ba030375eddcf6309d0eb4ecc197b8
-  data.tar.gz: 726533caf0cc85fa5421d536944c5f7d768b657746f042797119129ecc62ae00
+  metadata.gz: 335af2b4a7a3ab016abe414a29abbf75ce1ea4620db7a743c38c5bbc31d6e7e9
+  data.tar.gz: 72e73f24db2bcc84de791d0ce34e97982addc8d798404dd6b2b3bf51ad7dd0c7
 SHA512:
-  metadata.gz: 234fc276e10b4a7d85bb8ac4e8c27a58846651469c3bec4f40d0aa9c6c109ff7badefdf51bb4422e428a265ebe5671ce925c89ea8db53fb07aeda1cce67edb88
-  data.tar.gz: fd1a3f6fd2bbdab8700cf9e50cac99c7d5ad63a185ea338c5793386f04a1c544b2328aa0e991e60d9cafe8accbdcd4c737b5223fb59ce242732c352fcad0029a
+  metadata.gz: 1e3e237db240f2d1cef473a46a6108371f6e96353d415f8eb450bb9bc3fa220f4431c34cc151997582114467737d92cb14c724d66ad648ae30b34afb12d0c2d9
+  data.tar.gz: c654df6ee218ce489eea777187107f0154bbaa3fc9e1f6093dd94858e2ba3406db81f8c2b7f37a545adf7e76d96d0ecd3924f6a69121e513f0bd2fcb7b89c2e2

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    obs_deploy (0.3.1)
+    obs_deploy (0.3.6)
       cheetah
       dry-cli
+      git_diff_parser
       nokogiri
 
 GEM
@@ -16,17 +17,18 @@ GEM
     cheetah (0.5.2)
       abstract_method (~> 1.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     dry-cli (0.6.0)
       concurrent-ruby (~> 1.0)
+    git_diff_parser (3.2.0)
     hashdiff (1.0.1)
     jaro_winkler (1.5.4)
     method_source (1.0.0)
     mini_portile2 (2.5.0)
-    nokogiri (1.11.0)
+    nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.19.1)

data/lib/obs_deploy.rb

@@ -4,8 +4,8 @@ require 'open-uri'
 require 'net/http'
 require 'cheetah'
 require 'logger'
-
 require 'nokogiri'
+require 'git_diff_parser'
 require 'obs_deploy/version'
 require 'obs_deploy/check_diff'
 require 'obs_deploy/ssh'

data/lib/obs_deploy/check_diff.rb

@@ -2,10 +2,11 @@
 
 module ObsDeploy
   class CheckDiff
-    def initialize(server: 'https://api.opensuse.org', product: 'SLE_12_SP4', project: 'OBS:Server:Unstable')
+    def initialize(server: 'https://api.opensuse.org', product: 'SLE_12_SP4', project: 'OBS:Server:Unstable', target_server: 'https://api.opensuse.org')
       @server = server
       @product = product
       @project = project
+      @target_server = target_server
     end
 
     def package_version
@@ -33,7 +34,7 @@ module ObsDeploy
     def has_migration?
       return true if github_diff.nil? || github_diff.empty?
 
-      github_diff.match?(%r{db/migrate})
+      GitDiffParser.parse(github_diff).files.any? { |f| f.match?(%r{db/migrate}) }
     end
 
     def has_data_migration?
@@ -59,7 +60,7 @@ module ObsDeploy
     end
 
     def about_url
-      URI("#{@server}/about")
+      URI("#{@target_server}/about")
     end
   end
 end

data/lib/obs_deploy/cli/commands.rb

@@ -11,15 +11,17 @@ module ObsDeploy
       autoload :GetDeployedVersion, File.join(__dir__, 'commands/get_deployed_version.rb')
       autoload :Systemctl, File.join(__dir__, 'commands/systemctl.rb')
       autoload :GetPendingMigration, File.join(__dir__, 'commands/get_pending_migration.rb')
+      autoload :GetDiff, File.join(__dir__, 'commands/get_diff.rb')
 
       # register the commands and its command line
-      register 'available-package', GetPackageVersion
-      register 'deployed-version', GetDeployedVersion
+      register 'available-package', GetPackageVersion, aliases: ['ap']
+      register 'deployed-version', GetDeployedVersion, aliases: ['dv']
       register 'version', Version, aliases: ['v', '-v', '--version']
-      register 'deploy', Deploy
-      register 'refresh-repositories', RefreshRepositories
-      register 'systemctl', Systemctl
-      register 'pending-migrations', GetPendingMigration
+      register 'deploy', Deploy, aliases: ['dp']
+      register 'refresh-repositories', RefreshRepositories, aliases: ['rr']
+      register 'systemctl', Systemctl, aliases: ['sys']
+      register 'pending-migrations', GetPendingMigration, aliases: ['pm']
+      register 'check-diff', GetDiff, aliases: ['cd']
     end
   end
 end

data/lib/obs_deploy/cli/commands/get_deployed_version.rb

@@ -6,8 +6,14 @@ module ObsDeploy
       class GetDeployedVersion < Dry::CLI::Command
         desc 'Get the deployed version of OBS'
         option :url, type: :string, default: 'https://api.opensuse.org', desc: 'API url'
+        option :ignore_certificate, aliases: ['k'], type: :bool, default: false, desc: 'Ignore invalid or self-signed SSL certificates'
+
+        def call(url:, ignore_certificate:, **)
+          if ignore_certificate
+            OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
+            OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
+          end
 
-        def call(url:, **)
           puts "Deployed version: #{ObsDeploy::CheckDiff.new(server: url).obs_running_commit}"
         end
       end

data/lib/obs_deploy/cli/commands/get_diff.rb

@@ -2,7 +2,24 @@
 
 module ObsDeploy
   module CLI
-    class GetDiff
+    module Commands
+      class GetDiff < Dry::CLI::Command
+        desc 'Get diff between deployed package and available package'
+        option :url, type: :string, default: 'https://api.opensuse.org', desc: 'API url'
+        option :package, type: :string, default: 'obs-api', desc: 'Package name'
+        option :project, type: :string, default: 'OBS:Server:Unstable', desc: 'Project name'
+        option :product, type: :string, default: 'SLE_12_SP4', desc: 'Product name'
+        option :architecture, type: :string, default: 'x86_64', desc: 'Architecture'
+        option :ignore_certificate, aliases: ['k'], type: :bool, default: false, desc: 'Ignore invalid or self-signed SSL certificates'
+
+        def call(url:, product:, project:, ignore_certificate:, **)
+          if ignore_certificate
+            OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
+            OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
+          end
+          puts "diff : #{ObsDeploy::CheckDiff.new(server: url, project: project, product: product).github_diff}"
+        end
+      end
     end
   end
 end

data/lib/obs_deploy/cli/commands/get_package_version.rb

@@ -9,8 +9,14 @@ module ObsDeploy
         option :package, type: :string, default: 'obs-api', desc: 'Package name'
         option :product, type: :string, default: 'SLE_12_SP4', desc: 'Product name'
         option :architecture, type: :string, default: 'x86_64', desc: 'Architecture'
+        option :ignore_certificate, aliases: ['k'], type: :bool, default: false, desc: 'Ignore invalid or self-signed SSL certificates'
+
+        def call(url:, ignore_certificate:, product:, **)
+          if ignore_certificate
+            OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
+            OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
+          end
 
-        def call(url:, product:, **)
           puts "Available package: #{ObsDeploy::CheckDiff.new(server: url, product: product).package_version}"
         end
       end

data/lib/obs_deploy/cli/commands/get_pending_migration.rb

@@ -5,8 +5,14 @@ module ObsDeploy
     module Commands
       class GetPendingMigration < Dry::CLI::Command
         option :url, type: :string, default: 'https://api.opensuse.org', desc: 'API url'
+        option :ignore_certificate, aliases: ['k'], type: :bool, default: false, desc: 'Ignore invalid or self-signed SSL certificates'
+
+        def call(url:, ignore_certificate:, **)
+          if ignore_certificate
+            OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
+            OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
+          end
 
-        def call(url:, **)
           migrations = ObsDeploy::CheckDiff.new(server: url).migrations
           if migrations.empty?
             puts 'No pending migrations'

data/lib/obs_deploy/cli/commands/refresh_repositories.rb

@@ -6,11 +6,10 @@ module ObsDeploy
       class RefreshRepositories < Dry::CLI::Command
         desc 'Refresh zypper repositories'
         option :user, type: :string, default: 'root', desc: 'User'
-        option :dry_run, type: :bool, default: true, desc: 'Dry run'
         option :host, type: :string, default: 'localhost', desc: 'Set the server address'
         option :port, type: :int, default: 22, desc: 'Set the server port'
 
-        def call(user:, dry_run:, host:, port:, **)
+        def call(user:, host:, port:, **)
           ssh_driver = ObsDeploy::SSH.new(user: user, server: host, port: port)
           zypper = ObsDeploy::Zypper.new
           ssh_driver.run(zypper.refresh)

data/lib/obs_deploy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ObsDeploy
-  VERSION = '0.3.1'
+  VERSION = '0.3.6'
 end

data/obs_deploy.gemspec

@@ -35,5 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock'
   spec.add_dependency 'cheetah'
   spec.add_dependency 'dry-cli'
+  spec.add_dependency 'git_diff_parser'
   spec.add_dependency 'nokogiri'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Victor Pereira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git_diff_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +164,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Dockerfile.dev
 - Dockerfile.rpm
 - Gemfile

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.2