obs_deploy 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ebc8a1643cc4ad84ad5d480e44e6c98c8bbb008aaee87cd450f59ff85219083
-  data.tar.gz: 219d68cf9a244dd94f011bfe8126b7c667c2477059dd5d5132da81b99a25018f
+  metadata.gz: 7a525028509dae49e8de2a70652610f8dbbc5e81f2006022bb5691113f76d9aa
+  data.tar.gz: 6c45a8f8a0e8a2957c8ff59d1b696e670d8299e2c01cfdd5567a80d4d0d14148
 SHA512:
-  metadata.gz: 50e93f6d5392498366eb0da55273ac5fab0cb594b836a526147e081f85ba8e7e8dcda66246755c14905dbe4daa6108a8a3fc4c930f3b0ac119c9e02fb903248e
-  data.tar.gz: b93b82add9aea39fcb322f005bf9a739a9b1ab4f2dca241c405ea151855146a2c5217f1f324fbc324723ea1d70cf6da8e0d4e0faeb45cc27ce0d6582587521cb
+  metadata.gz: 2fab4b9747706c4d5e2b44581a60c0f3ef21fe5e02b4f415959e4c907e0f46c0c0211d64b53d266107d0e33b05852ec8886462b587505908ebccf29eadd797b2
+  data.tar.gz: 61f0eca04c6465ba339bfde0b9cf8d4a846db4c236501bacd817b8b99fa0931aca1c833bd1d03b339fade9fae56c9825f6c7dd0db691523e7d88d1e77b4e937f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    obs_deploy (0.2.5)
+    obs_deploy (0.3.5)
       cheetah
       dry-cli
       nokogiri
@@ -16,7 +16,7 @@ GEM
     cheetah (0.5.2)
       abstract_method (~> 1.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -25,9 +25,10 @@ GEM
     hashdiff (1.0.1)
     jaro_winkler (1.5.4)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.5.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     parallel (1.19.1)
     parser (2.7.0.5)
       ast (~> 2.4.0)
@@ -35,6 +36,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.3)
+    racc (1.5.2)
     rainbow (3.0.0)
     rake (13.0.1)
     rexml (3.2.4)

data/dist/Makefile

@@ -1,6 +1,6 @@
 spec:
 	gem2rpm --fetch obs_deploy > rubygem-obs_deploy.spec
 	rm *.gem
-clean:
+spec-clean:
 	spec-cleaner rubygem-obs_deploy.spec > x.spec
 	mv x.spec rubygem-obs_deploy.spec

data/dist/rubygem-obs_deploy.spec

@@ -1,104 +1,51 @@
-# Generated from obs_deploy-0.2.5.gem by gem2rpm -*- rpm-spec -*-
-%define rbname obs_deploy
-%define version 0.2.5
-%define release 1
-
-Summary: OBS Deployment tool
-Name: ruby-gems-%{rbname}
-
-Version: %{version}
-Release: %{release}
-Group: Development/Ruby
-License: Distributable
-URL: https://openbuildservice.org
-Source0: %{rbname}-%{version}.gem
-# Make sure the spec template is included in the SRPM
-Source1: ruby-gems-%{rbname}.spec.in
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: ruby [""]
-Requires: ruby-gems >= 3.0.6
-Requires: ruby-gems-bundler >= 2.0
-Requires: ruby-gems-bundler < 3
-Requires: ruby-gems-pry 
-Requires: ruby-gems-rake >= 13.0
-Requires: ruby-gems-rake < 14
-Requires: ruby-gems-rspec >= 3.0
-Requires: ruby-gems-rspec < 4
-Requires: ruby-gems-rubocop 
-Requires: ruby-gems-webmock 
-Requires: ruby-gems-cheetah 
-Requires: ruby-gems-dry-cli 
-Requires: ruby-gems-nokogiri 
-BuildRequires: ruby [""]
-BuildRequires: ruby-gems >= 3.0.6
-BuildArch: noarch
-Provides: ruby(Obs_deploy) = %{version}
-
-%define gemdir /home/vpereira/.rvm/gems/ruby-2.5.0
-%define gembuilddir %{buildroot}%{gemdir}
+#
+# spec file for package rubygem-obs_deploy
+#
+# Copyright (c) 2020 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define mod_name obs_deploy
+%define mod_full_name %{mod_name}-%{version}
+Name:           rubygem-obs_deploy
+Version:        0.3.0
+Release:        0
+Summary:        OBS Deployment tool
+License:        
+Group:          Development/Languages/Ruby
+URL:            https://openbuildservice.org
+Source:         https://rubygems.org/gems/%{mod_full_name}.gem
+BuildRequires:  %{rubygem gem2rpm}
+BuildRequires:  %{ruby}
+BuildRequires:  ruby-macros >= 5
+BuildRequires:  update-alternatives
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         update-alternatives
 
 %description
 OBS Deployment tool.
 
-
 %prep
-%setup -T -c
 
 %build
 
 %install
-%{__rm} -rf %{buildroot}
-mkdir -p %{gembuilddir}
-gem install --local --install-dir %{gembuilddir} --force %{SOURCE0}
-mkdir -p %{buildroot}/%{_bindir}
-mv %{gembuilddir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{gembuilddir}/bin
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%files
-%defattr(-, root, root)
-%{_bindir}/console
-%{_bindir}/obs_deploy
-%{_bindir}/setup
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-%{gemdir}/gems/obs_deploy-0.2.5/
-
+%gem_install \
+  --symlink-binaries \
+  --doc-files="README.md" \
+  -f
 
-%doc %{gemdir}/doc/obs_deploy-0.2.5
-%{gemdir}/cache/obs_deploy-0.2.5.gem
-%{gemdir}/specifications/obs_deploy-0.2.5.gemspec
+%gem_packages
 
 %changelog

data/lib/obs_deploy/check_diff.rb

@@ -2,9 +2,11 @@
 
 module ObsDeploy
   class CheckDiff
-    def initialize(server: 'https://api.opensuse.org', product: 'SLE_12_SP4')
+    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
@@ -25,6 +27,10 @@ module ObsDeploy
       Net::HTTP.get(URI("https://github.com/openSUSE/open-build-service/compare/#{obs_running_commit}...#{package_commit}.diff"))
     end
 
+    def new_version_available?
+      obs_running_commit != package_commit
+    end
+
     def has_migration?
       return true if github_diff.nil? || github_diff.empty?
 
@@ -50,11 +56,11 @@ module ObsDeploy
     end
 
     def package_url
-      URI("#{@server}/public/build/OBS:Server:Unstable/#{@product}/x86_64/obs-server")
+      URI("#{@server}/public/build/#{@project}/#{@product}/x86_64/obs-server")
     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:, **)
+        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
+ 
           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,25 @@
 
 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:, product:, **)
+        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
+ 
           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:, **)
+        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
+ 
           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.0'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Victor Pereira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,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