obs_deploy 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e0cc88321f0bc33598a1e3ea3ded2ed35b4d9bead0dc610283f8763c2dd535
-  data.tar.gz: 95753db3ab45df12657cd1732e5eb99a90f297a5fe4bfc755faeaface8768e67
+  metadata.gz: 7ebc8a1643cc4ad84ad5d480e44e6c98c8bbb008aaee87cd450f59ff85219083
+  data.tar.gz: 219d68cf9a244dd94f011bfe8126b7c667c2477059dd5d5132da81b99a25018f
 SHA512:
-  metadata.gz: 358cdbc116947e6f1a4138cf3a1bb547758b362f5d46cb6bf0bca2324010ad2ed5c526a16551c0aa35d6fa6d8ab2e2e00dbf27ee7e8da07e290aeea54c18733a
-  data.tar.gz: 0a9dfb324d28c6629ddb598e7081c22561d63721f595dd455528b7c83bae324903f6f25985c6fc963dafca3a4bc26b8bdbec2e9a00585762a0ff795ad6b607a2
+  metadata.gz: 50e93f6d5392498366eb0da55273ac5fab0cb594b836a526147e081f85ba8e7e8dcda66246755c14905dbe4daa6108a8a3fc4c930f3b0ac119c9e02fb903248e
+  data.tar.gz: b93b82add9aea39fcb322f005bf9a739a9b1ab4f2dca241c405ea151855146a2c5217f1f324fbc324723ea1d70cf6da8e0d4e0faeb45cc27ce0d6582587521cb

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

@@ -1,54 +1,104 @@
-#
-# 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}
-%define rb_suffix         ruby2.6
-Name:           rubygem-obs_deploy
-Version:        0.2.0
-Release:        0
-Summary:        OBS Deployment tool
-License:        MIT
-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
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq:         update-alternatives
+# 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}
 
 %description
 OBS Deployment tool.
 
+
 %prep
+%setup -T -c
 
 %build
 
 %install
-%rails_fix_ruby_shebang bin/
-%gem_install \
-  --symlink-binaries \
-  --doc-files="README.md" \
-  -f
+%{__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_packages
+%doc %{gemdir}/doc/obs_deploy-0.2.5
+%{gemdir}/cache/obs_deploy-0.2.5.gem
+%{gemdir}/specifications/obs_deploy-0.2.5.gemspec
 
 %changelog

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

@@ -51,7 +51,16 @@ module ObsDeploy
     end
 
     def write_apache_sysconfig(content)
-      File.open(path, 'wb') { |file| file.write(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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ObsDeploy
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 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.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Pereira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-12-08 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:
@@ -151,9 +151,11 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
-- Dockerfile
+- Dockerfile.dev
+- Dockerfile.rpm
 - Gemfile
 - Gemfile.lock
+- Makefile
 - README.md
 - Rakefile
 - bin/console
@@ -169,6 +171,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 +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
@@ -201,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: []