obs_deploy 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41cc050c5b998c658f9e490356baecffde0c4d20c8f9856cb3f9d9365e47ff2d
-  data.tar.gz: 9c4bf4468558287c91bcce67af42af569020d4414d9676fd535bbb6ea503f81d
+  metadata.gz: a0f5719e3a953c7cabd13373bb9671b6f9ba030375eddcf6309d0eb4ecc197b8
+  data.tar.gz: 726533caf0cc85fa5421d536944c5f7d768b657746f042797119129ecc62ae00
 SHA512:
-  metadata.gz: 3935393353a5b72e06bccc8ae92c9dc53f1047fe20d8d7597c8ed80d081e4e1f17a6e816c9f61c5a1fd13c3b1293e51695e1aa2126a23c17d57957a3534124c3
-  data.tar.gz: acdfdcde737dd62fbdfde71225a4a71878118671f5a3b9c638090478c2ee8cea3cb0e56b35042caf009b8de4e682b169b8929a028dd9142666b28294e210b4cc
+  metadata.gz: 234fc276e10b4a7d85bb8ac4e8c27a58846651469c3bec4f40d0aa9c6c109ff7badefdf51bb4422e428a265ebe5671ce925c89ea8db53fb07aeda1cce67edb88
+  data.tar.gz: fd1a3f6fd2bbdab8700cf9e50cac99c7d5ad63a185ea338c5793386f04a1c544b2328aa0e991e60d9cafe8accbdcd4c737b5223fb59ce242732c352fcad0029a

data/.rubocop.yml

@@ -0,0 +1,26 @@
+# The behavior of RuboCop can be controlled via the .rubocop.yml
+# configuration file. It makes it possible to enable/disable
+# certain cops (checks) and to alter their behavior if they accept
+# any parameters. The file can be placed either in your home
+# directory or in some project directory.
+#
+# RuboCop will start looking for the configuration file in the directory
+# where the inspected file is and continue its way up to the root directory.
+#
+# See https://github.com/rubocop-hq/rubocop/blob/master/manual/configuration.md
+
+AllCops:
+  Exclude:
+    - 'dist/rubygem-obs_deploy.spec'
+
+Metrics/BlockLength:
+  Enabled: false
+
+Layout/LineLength:
+  Enabled: false
+
+Layout/LineLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

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.2)
+    obs_deploy (0.3.1)
       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
 
@@ -61,6 +64,10 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Fixtures
+
+To generate the fixtures (located under `spec/fixtures`), we are using `curl -si $URL > $FIXTURE` 
+
 ### Run the `bin/obs_deploy` on development:
 
 On the checked out source, run the following:
@@ -80,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.
 
@@ -97,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

@@ -11,6 +11,8 @@ require 'obs_deploy/check_diff'
 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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module ObsDeploy
+  class ApacheSysconfig
+    attr_reader :path
+
+    def initialize
+      @path = '/etc/sysconfig/apache2'
+    end
+
+    def enable_maintenance_mode
+      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
+      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?
+      find_server_flags.all? { |r| r.include?('MAINTENANCE') }
+    end
+
+    private
+
+    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
+end

data/lib/obs_deploy/check_diff.rb

@@ -2,9 +2,10 @@
 
 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')
       @server = server
       @product = product
+      @project = project
     end
 
     def package_version
@@ -25,10 +26,26 @@ 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?
 
-      !!github_diff.match(%r{db/migrate})
+      github_diff.match?(%r{db/migrate})
+    end
+
+    def has_data_migration?
+      return true if github_diff.nil? || github_diff.empty?
+
+      github_diff.match(%r{db/data})
+    end
+
+    def data_migrations
+      return [] unless has_data_migration?
+
+      github_diff.match(%r{db/data/.*\.rb}).to_a
     end
 
     def migrations
@@ -38,7 +55,7 @@ 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

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module ObsDeploy
+  module CLI
+    class GetDiff
+    end
+  end
+end

data/lib/obs_deploy/systemctl.rb

@@ -10,6 +10,14 @@ module ObsDeploy
       run ['systemctl'] + ['list-dependencies'] + target
     end
 
+    def restart_apache
+      run ['systemctl'] + ['restart'] + ['apache2']
+    end
+
+    def status_apache
+      run ['systemctl'] + ['status'] + ['apache2']
+    end
+
     private
 
     def target

data/lib/obs_deploy/version.rb

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

data/lib/obs_deploy/zypper.rb

@@ -6,17 +6,33 @@ module ObsDeploy
 
     def initialize(dry_run: true, package_name: 'obs-api')
       @dry_run = dry_run
+      @package_name = package_name
     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
 
-     private
+    # 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
 
     def run(params)
       params
@@ -31,15 +47,15 @@ module ObsDeploy
     end
 
     def package_name
-      ['obs-api']
+      [@package_name]
     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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Victor Pereira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2021-01-04 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:
@@ -149,10 +149,13 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
-- Dockerfile
+- Dockerfile.dev
+- Dockerfile.rpm
 - Gemfile
 - Gemfile.lock
+- Makefile
 - README.md
 - Rakefile
 - bin/console
@@ -163,10 +166,12 @@ files:
 - dist/rubygem-obs_deploy.spec
 - entrypoint.sh
 - lib/obs_deploy.rb
+- 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
 - lib/obs_deploy/cli/commands/get_pending_migration.rb
 - lib/obs_deploy/cli/commands/refresh_repositories.rb
@@ -183,7 +188,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
@@ -199,7 +204,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: []