obs_deploy 0.2.4 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5cefbf1ffca4ed2d230cd169498f9360900f937066e87191e9a0709fb6a8d4
-  data.tar.gz: 4b87d73be2eebec73b7a060db49bac63d548f22d4a65bb36247214af1c40d2fb
+  metadata.gz: 31f63b8788107bedb1301441ad228264914e7bee05fde3818b293c6c65601ca5
+  data.tar.gz: 06a350ca3015869e292b5f1303e4155abd7d5d7cb751bb8e607b15135834bdad
 SHA512:
-  metadata.gz: db9fdc959797fa2229398817caf16b821e81464e188a16fe6b9be35da1aed74e9fdd2151fb21b0ccb887a07c6b196fe11ce310587c2d53d45dae2939071b47e5
-  data.tar.gz: 2a8f6ac5f785efb947c4c40f57609c1cb8724fc7d7362bcadc848fc34083cefac99454c6daca47581cc195cd56357e94d97beaa99126c49036045cb32a8fd46a
+  metadata.gz: c13028e79c56e20c27dabfa96f5abc3e2896ca83ac3b05df3ccfc78d52bb8e4f66aad42b45898dfe190acab54ed5b5d1ca6e67420452737e33fe7ed4381ca26c
+  data.tar.gz: 56c9454fd932d2516e2c6979eef5f7654b631a6c6e7effabfe6598efb5c170d10b08403492e23ed234fc9276712dd3de9dab80549678a1b3c0bd6602a39abdf5

data/Dockerfile.dev

@@ -0,0 +1,8 @@
+FROM opensuse/tumbleweed
+
+RUN zypper --gpg-auto-import-keys refresh
+RUN zypper install -y openssh vim iputils
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    obs_deploy (0.2.4)
+    obs_deploy (0.3.3)
       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.0)
+      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/Makefile

@@ -0,0 +1,9 @@
+docker-dev:
+	docker build -f Dockerfile.dev -t $(USER)/obs_deploy_dev .
+	docker run --rm -it -v "$(HOME)/.ssh:/tmp/.ssh:ro" -v "$(PWD):/obs_deploy" $(USER)/obs_deploy_dev bash
+
+docker-rpm:
+	docker build -f Dockerfile.rpm -t $(USER)/obs_deploy_dev .
+	docker run --rm -it -v "$(HOME)/.ssh:/tmp/.ssh:ro" -v "$(PWD):/obs_deploy" $(USER)/obs_deploy_dev bash
+
+

data/README.md

@@ -5,6 +5,9 @@ Simple tool to deploy OBS via zypper to our reference server
 ## Build Status
 [![CircleCI](https://circleci.com/gh/vpereira/obs_deploy.svg?style=svg)](https://app.circleci.com/pipelines/github/vpereira/obs_deploy)
 
+## Codebeat
+[![codebeat badge](https://codebeat.co/badges/767d7e65-0364-4386-a26e-99ad228dfe31)](https://codebeat.co/projects/github-com-vpereira-obs_deploy-master)
+
 
 ## Installation
 
@@ -84,7 +87,7 @@ if you want to run it against the OBS appliance running on VirtualBox:
 - then run the container as:
 
     ```
-    docker run --rm -it -v "$HOME/.ssh:/tmp/.ssh:ro" $USER/obs_deploy bash
+    make docker-dev
     ```
 Now you are inside the container and should be able to ping the obs appliance.
 
@@ -101,6 +104,15 @@ If you want to add new command to the cli, please read the `dry-cli` documentati
 
 The commands are being sent via ssh and ssh is being called via `cheetah` https://github.com/openSUSE/cheetah. Please Read the `ssh.rb` file, specially the `SSH#run` method
 
+## RPM Building
+
+Under dist/ we have the necessary files to use to build the gem as rpm. The
+`_service` still not used. Mainly because we need either to build the rubygem
+dependencies or use https://github.com/openSUSE/obs-service-bundle_gems
+
+Today as it is, you have to push the gem to rubygems and then generate the spec
+and push it to build service
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/vpereira/obs_deploy.

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/_service

@@ -1,4 +1,12 @@
 <services>
- <service name="download_files">
+ <service name="tar_scm">
+  <param name="scm">git</param>
+  <param name="url">git://github.com/vpereira/obs_deploy.git</param>
+  <param name="revision">master</param>
+  <param name="version">0.2.0</param>
  </service>
+ <service name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
 </services>

data/dist/rubygem-obs_deploy.spec

@@ -18,23 +18,21 @@
 
 %define mod_name obs_deploy
 %define mod_full_name %{mod_name}-%{version}
-%define rb_suffix         ruby2.6
 Name:           rubygem-obs_deploy
-Version:        0.2.0
+Version:        0.3.0
 Release:        0
 Summary:        OBS Deployment tool
-License:        MIT
+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:  ruby-common-rails
+BuildRequires:  update-alternatives
 # FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         update-alternatives
 
-
 %description
 OBS Deployment tool.
 
@@ -43,7 +41,6 @@ OBS Deployment tool.
 %build
 
 %install
-%rails_fix_ruby_shebang bin/
 %gem_install \
   --symlink-binaries \
   --doc-files="README.md" \

data/lib/obs_deploy.rb

@@ -12,6 +12,7 @@ require 'obs_deploy/ssh'
 require 'obs_deploy/zypper'
 require 'obs_deploy/systemctl'
 require 'obs_deploy/apache_sysconfig'
+require 'tempfile'
 
 module ObsDeploy
   class Error < StandardError; end

data/lib/obs_deploy/apache_sysconfig.rb

@@ -2,29 +2,64 @@
 
 module ObsDeploy
   class ApacheSysconfig
-    attr_reader :apache_sysconfig
+    attr_reader :path
 
     def initialize
-      @apache_sysconfig = '/etc/sysconfig/apache2'
+      @path = '/etc/sysconfig/apache2'
     end
 
     def enable_maintenance_mode
-      write_apache_sysconfig('APACHE_SERVER_FLAGS="STATUS MAINTENANCE"')
+      unless maintenance_mode?
+        content = File.read(path).gsub(/^#{server_flags}=\"STATUS\"$/,
+                                       apache_status_line(maintenance))
+        write_apache_sysconfig(content)
+      end
     end
 
     def disable_maintenance_mode
-      write_apache_sysconfig('APACHE_SERVER_FLAGS="STATUS"')
+      if maintenance_mode?
+        content = File.read(path).gsub(/^#{server_flags}=\"STATUS MAINTENANCE\"/,
+                                       apache_status_line(no_maintenance))
+        write_apache_sysconfig(content)
+      end
     end
 
     def maintenance_mode?
-      File.open(apache_sysconfig).read.include?('MAINTENANCE')
+      find_server_flags.all? { |r| r.include?('MAINTENANCE') }
     end
 
     private
 
-    def write_apache_sysconfig(line)
-      File.open(apache_sysconfig, 'w') do |file|
-        file.write(line)
+    def no_maintenance
+      'STATUS'
+    end
+
+    def maintenance
+      'STATUS MAINTENANCE'
+    end
+
+    def server_flags
+      'APACHE_SERVER_FLAGS'
+    end
+
+    def apache_status_line(status)
+      "#{server_flags}=\"#{status}\""
+    end
+
+    def find_server_flags
+      File.readlines(path).grep(/^#{server_flags}=/)
+    end
+
+    def write_apache_sysconfig(content)
+      f = Tempfile.new
+      f.write(content)
+      begin
+        File.rename(f.path, path)
+      rescue SystemCallError => e
+        puts e.inspect
+      ensure
+        f.unlink
+        f.close
       end
     end
   end

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_diff.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ObsDeploy
+  module CLI
+    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'
+
+        def call(url:, product:, project:, **)
+          puts "diff : #{ObsDeploy::CheckDiff.new(server: url, project: project, product: product).github_diff}"
+        end
+      end
+    end
+  end
+end

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

@@ -6,13 +6,12 @@ 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:, **)
           ssh_driver = ObsDeploy::SSH.new(user: user, server: host, port: port)
-          zypper = ObsDeploy::Zypper.new
+          zypper = ObsDeploy::Zypper.new(dry_run: dry_run)
           ssh_driver.run(zypper.refresh)
         end
       end

data/lib/obs_deploy/version.rb

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

data/lib/obs_deploy/zypper.rb

@@ -10,11 +10,26 @@ module ObsDeploy
     end
 
     def update
-      run ['zypper'] + update_string + package_name
+      run %w[zypper] + update_string + package_name
     end
 
     def refresh
-      run ['zypper', '--non-interactive', '--gpg-auto-import-keys', 'refresh']
+      run %w[zypper --non-interactive --gpg-auto-import-keys refresh]
+    end
+
+    # TODO
+    # check if we want to lock from specific repositories
+    def add_lock
+      run %w[zypper addlock] + package_name
+    end
+
+    def remove_lock
+      run %w[zypper removelock] + package_name
+    end
+
+    def locked?
+      # check the return value
+      run %w[zypper locks] + package_name
     end
 
     private
@@ -36,11 +51,11 @@ module ObsDeploy
     end
 
     def update_params
-      ['--non-interactive', 'update', '--best-effort', '--details']
+      %w[--non-interactive update --best-effort --details]
     end
 
     def dry_run_params
-      ['--dry-run --download-only']
+      %w[--dry-run --download-only]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.3
 platform: ruby
 authors:
 - Victor Pereira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - vpereira@suse.de
 executables:
@@ -150,10 +150,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
-- Dockerfile
+- Dockerfile.dev
+- Dockerfile.rpm
 - Gemfile
 - Gemfile.lock
+- Makefile
 - README.md
 - Rakefile
 - bin/console
@@ -169,6 +170,7 @@ files:
 - 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
 - lib/obs_deploy/cli/commands/get_pending_migration.rb
 - lib/obs_deploy/cli/commands/refresh_repositories.rb
@@ -185,7 +187,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://openbuildservice.org
   source_code_uri: https://github.com/vpereira/obs_deploy.git
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: OBS Deployment tool
 test_files: []

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