obs_deploy 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a525028509dae49e8de2a70652610f8dbbc5e81f2006022bb5691113f76d9aa
-  data.tar.gz: 6c45a8f8a0e8a2957c8ff59d1b696e670d8299e2c01cfdd5567a80d4d0d14148
+  metadata.gz: 742d7413da49ee796b72615ec9afe90e02932ff51515ed35f309a69bd36d70b7
+  data.tar.gz: 1c3dc21990343ce26ddd0adf22dd5b648e6f242d5e51d610517185768c9f9ec6
 SHA512:
-  metadata.gz: 2fab4b9747706c4d5e2b44581a60c0f3ef21fe5e02b4f415959e4c907e0f46c0c0211d64b53d266107d0e33b05852ec8886462b587505908ebccf29eadd797b2
-  data.tar.gz: 61f0eca04c6465ba339bfde0b9cf8d4a846db4c236501bacd817b8b99fa0931aca1c833bd1d03b339fade9fae56c9825f6c7dd0db691523e7d88d1e77b4e937f
+  metadata.gz: 774d0befa8e754c054956e2eaefdc208460bf4f1e7914fb0f92208dfd21b09bcef0d60ba2a255d9543cadd54cc3d0ed8eb8cbf50cd9a89c282bcde42d05b7665
+  data.tar.gz: 71c62909fe69a8899e91eefe7a6bd7ccfb2f56a45561913dc854dc5d9838790ecf75080abb23c3f747e90fbad142ee0e682b14219b82d570a31f17506f334fa2

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.5)
+    obs_deploy (0.3.9)
       cheetah
       dry-cli
+      git_diff_parser
       nokogiri
 
 GEM
@@ -16,12 +17,13 @@ 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)
@@ -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/apache_sysconfig.rb

@@ -10,7 +10,7 @@ module ObsDeploy
 
     def enable_maintenance_mode
       unless maintenance_mode?
-        content = File.read(path).gsub(/^#{server_flags}=\"STATUS\"$/,
+        content = File.read(path).gsub(/^#{server_flags}="STATUS"$/,
                                        apache_status_line(maintenance))
         write_apache_sysconfig(content)
       end
@@ -18,7 +18,7 @@ module ObsDeploy
 
     def disable_maintenance_mode
       if maintenance_mode?
-        content = File.read(path).gsub(/^#{server_flags}=\"STATUS MAINTENANCE\"/,
+        content = File.read(path).gsub(/^#{server_flags}="STATUS MAINTENANCE"/,
                                        apache_status_line(no_maintenance))
         write_apache_sysconfig(content)
       end

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

@@ -13,7 +13,7 @@ module ObsDeploy
             OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
             OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
           end
- 
+
           puts "Deployed version: #{ObsDeploy::CheckDiff.new(server: url).obs_running_commit}"
         end
       end

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

@@ -19,7 +19,6 @@ module ObsDeploy
           end
           puts "diff : #{ObsDeploy::CheckDiff.new(server: url, project: project, product: product).github_diff}"
         end
-
       end
     end
   end

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

@@ -16,7 +16,7 @@ module ObsDeploy
             OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
             OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
           end
- 
+
           puts "Available package: #{ObsDeploy::CheckDiff.new(server: url, product: product).package_version}"
         end
       end

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

@@ -1,23 +1,28 @@
 # frozen_string_literal: true
 
+require 'openssl'
 module ObsDeploy
   module CLI
     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'
+        option :url, type: :string, default: 'https://api.opensuse.org', desc: 'where the packages are available to be installed'
+        option :targeturl, type: :string, default: 'https://api.opensuse.org', desc: 'where we actually want to deploy '
+        option :ignore_certificate, aliases: ['k'], type: :boolean, default: false, desc: 'Ignore invalid or self-signed SSL certificates'
 
-        def call(url:, ignore_certificate:, **)
+        def call(url:, targeturl:, ignore_certificate:, **)
           if ignore_certificate
             OpenSSL::SSL.send(:remove_const, :VERIFY_PEER)
             OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE)
           end
- 
-          migrations = ObsDeploy::CheckDiff.new(server: url).migrations
+
+          migrations = ObsDeploy::CheckDiff.new(server: url, target_server: targeturl).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.5'
+  VERSION = '0.4.0'
 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.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Victor Pereira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-03-11 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