obs_deploy 0.3.4 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b06482a05bb760b164c26f015d69b09b13b59a855db5d406a63824cc475b308
-  data.tar.gz: 0220bcb91b6c9064362ba28ef74e0e7ea55fdbca7be5e246dd07ce5e5d0adb7f
+  metadata.gz: 270586d05289871ade6a65de49c6e363d58525745535da5fc5f95c3a155f26b2
+  data.tar.gz: 5df94bb7f4fbeb7a0068ecf59af2d0904aafbc0b854aa03884b3ffa445b2ecae
 SHA512:
-  metadata.gz: 684270b637b96c5c3e6fbc18f3c3a8f9bf752c49f818b288ae568433b08582141c74be222f2296484a99d24d1dbaa6b20224aedb09810a283a29a28bf606dd63
-  data.tar.gz: 7b9e429fcb39000623e6b2a1f3b581a4f3348551e963ee2ad9906cf3905256add5ad0a3ef6519f470c54989834310326e08d071bbd85275a66b1d2ea4b3d7f84
+  metadata.gz: c26bb9750eaa66e1fda974966b25077a2b9b4bb40ecf0eca4d5bc208b433f5e7145a7b583b35d95c8ef8f3156245af8588f02cb25882a11129d95f08c8da0a75
+  data.tar.gz: e15d6d0fc1842b721b2db3dd759a4185330809d490f8ed850c9962444b5504b2df2ea787ecb0e3485b422ae26a607c7434e08a610c104ea47787cde28e58c231

data/Dockerfile.dev

@@ -1,7 +1,8 @@
 FROM opensuse/tumbleweed
 
 RUN zypper --gpg-auto-import-keys refresh
-RUN zypper install -y openssh vim iputils
+RUN zypper install -y openssh vim iputils ruby2.7 ruby2.7-devel ruby2.7-rubygem-cheetah ruby2.7-rubygem-nokogiri 
+RUN gem install git_diff_parser dry-cli
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    obs_deploy (0.3.4)
+    obs_deploy (0.3.9)
       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)
@@ -82,4 +84,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.8

data/README.md

@@ -27,25 +27,6 @@ zypper in  ruby2.6-rubygem-obs_deploy
 ## Usage
 
 
-
-### To deploy
-
-As default it will run in `dry-run` mode (no changes are made)
-
-#### dry-run:
-
-`obs_deploy deploy --user root --host localhost`
-
-or 
-
-`obs_deploy deploy --user root --host localhost --dry-run`
-
-### deploy
-
-`obs_deploy deploy --user root --host localhost --no-dry-run`
-
-
-
 ### To check which version is deployed
 
 `obs_deploy deployed-version [--host <server>]`

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

@@ -34,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?

data/lib/obs_deploy/cli/commands.rb

@@ -17,7 +17,6 @@ module ObsDeploy
       register 'available-package', GetPackageVersion, aliases: ['ap']
       register 'deployed-version', GetDeployedVersion, aliases: ['dv']
       register 'version', Version, aliases: ['v', '-v', '--version']
-      register 'deploy', Deploy, aliases: ['dp']
       register 'refresh-repositories', RefreshRepositories, aliases: ['rr']
       register 'systemctl', Systemctl, aliases: ['sys']
       register 'pending-migrations', GetPendingMigration, aliases: ['pm']

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

@@ -10,8 +10,13 @@ module ObsDeploy
         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:, **)
+        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

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,13 +5,21 @@ 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'
+            exit(0)
           else
             puts migrations
+            exit(1)
           end
         end
       end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
 module ObsDeploy
   module CLI
     module Commands

data/lib/obs_deploy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ObsDeploy
-  VERSION = '0.3.4'
+  VERSION = '0.3.9'
 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.4
+  version: 0.3.9
 platform: ruby
 authors:
 - Victor Pereira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-03-05 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
@@ -168,7 +182,6 @@ files:
 - lib/obs_deploy/apache_sysconfig.rb
 - lib/obs_deploy/check_diff.rb
 - lib/obs_deploy/cli/commands.rb
-- lib/obs_deploy/cli/commands/deploy.rb
 - lib/obs_deploy/cli/commands/get_deployed_version.rb
 - lib/obs_deploy/cli/commands/get_diff.rb
 - lib/obs_deploy/cli/commands/get_package_version.rb

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module ObsDeploy
-  module CLI
-    module Commands
-      class Deploy < Dry::CLI::Command
-        desc 'Deploy obs-api'
-
-        option :user, type: :string, default: 'root', desc: 'User'
-        option :dry_run, type: :boolean, 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:, **)
-          ssh_driver = ObsDeploy::SSH.new(user: user, server: host, port: port)
-          zypper = ObsDeploy::Zypper.new(dry_run: dry_run)
-          ssh_driver.run(zypper.update)
-        end
-      end
-    end
-  end
-end