obs_deploy 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bb058921426d313f82510add524de887bc8f2be01379528680bef135c0ab99f
-  data.tar.gz: 5a39875b8386d573bf3f4da424c4058eebcd1269dfef8fbe40fe0e104b0d3d4b
+  metadata.gz: 8ab8c1bfc4cf824dd5e4efd68d9276e034dfe91015686331e5630c0c558054f8
+  data.tar.gz: eb4100e89d9df67106937087ca61998a5ff00fc3631a465b4dbf9b1ff818a19a
 SHA512:
-  metadata.gz: dafbd837d3498870b8cccb90d9f486868ad3ee17f7b85ca4febb11700f2f3d56178dd1d18b5c08c8cfc18601bbf6960b8fcddfe98151b08ab8ac3506b3e84f93
-  data.tar.gz: b33c174b2c3f6bb7d75e73764024fcdf4f98d8b9a3a3f8b68a16572c5c7ae2f4c2c0767d756b8d2bf0ae3e466c3a68d5e64b2d65e9fbcb4852b165e2c4124e5b
+  metadata.gz: ea0f667fab7e119b895aaf4fe9215593d17d38af12451cfe679f09b4425bb8de13b3e4f1a8617da2e15fe0e4803f3b8dad697a9151376f5948e65610a226c99c
+  data.tar.gz: 07e2d1834cde084672db356d689f7fed31e25a6f384ccbd17a3a29525ff621949d986cc759e2238ae9b350f7158d1802b756803d60cafd6ba869c2ea805e5f01

data/Dockerfile

@@ -0,0 +1,13 @@
+FROM opensuse/tumbleweed
+
+RUN zypper ar -f -G https://download.opensuse.org/repositories/home:/vpereirabr/openSUSE_Tumbleweed/home:vpereirabr.repo
+RUN zypper --gpg-auto-import-keys refresh
+RUN zypper install -y openssh vim iputils
+RUN zypper install -y ruby2.6-rubygem-obs_deploy
+
+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.1.2)
+    obs_deploy (0.1.5)
       cheetah
       dry-cli
       nokogiri
@@ -36,7 +36,7 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.3)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -74,7 +74,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   obs_deploy!
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   webmock

data/README.md

@@ -6,8 +6,15 @@ Simple tool to deploy OBS via zypper to our reference server
 
 Just run:
 
-```ruby
-gem 'obs_deploy'
+```
+gem install obs_deploy
+```
+
+or
+
+```
+zypper ar https://download.opensuse.org/repositories/home:/vpereirabr/openSUSE_Tumbleweed/home:vpereirabr.repo
+zypper in  ruby2.6-rubygem-obs_deploy
 ```
 
 ## Usage
@@ -46,6 +53,30 @@ On the checked out source, run the following:
 
 `ruby -Ilib bin/obs_deploy -v`
 
+if you want to run it against the OBS appliance running on VirtualBox:
+
+- Make sure that you can ssh without password into your VM
+- Make sure the appliance is running in __bridge__ mode
+- build the docker image as:
+  
+  ```
+  docker build -t $USER/obs_deploy .
+  ```
+
+- then run the container as:
+
+    ```
+    docker run --rm -it -v "$HOME/.ssh:/tmp/.ssh:ro" $USER/obs_deploy bash
+    ```
+Now you are inside the container and should be able to ping the obs appliance.
+
+From there:
+
+```
+$ obs_deploy refresh-repositories --host=$APPLIANCE_IP
+```
+
+
 ## Hacking
 
 If you want to add new command to the cli, please read the `dry-cli` documentation https://dry-rb.org/gems/dry-cli/0.4/. The commands are in the `obs_deploy/cli/commands` directory.

data/bin/obs_deploy

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'obs_deploy'
 require 'dry/cli'
 require 'obs_deploy/cli/commands'

data/dist/rubygem-obs_deploy.spec

@@ -19,10 +19,10 @@
 %define mod_name obs_deploy
 %define mod_full_name %{mod_name}-%{version}
 Name:           rubygem-obs_deploy
-Version:        0.1.1
+Version:        0.1.2
 Release:        0
 Summary:        OBS Deployment tool
-License:        
+License:        MIT
 Group:          Development/Languages/Ruby
 URL:            https://openbuildservice.org
 Source:         https://rubygems.org/gems/%{mod_full_name}.gem

data/entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+cp -R /tmp/.ssh /root/.ssh
+chmod 700 /root/.ssh
+chmod 644 /root/.ssh/id_rsa.pub
+chmod 600 /root/.ssh/id_rsa
+
+exec "$@"

data/lib/obs_deploy.rb

@@ -3,54 +3,15 @@
 require 'open-uri'
 require 'net/http'
 require 'cheetah'
+require 'logger'
+
 require 'nokogiri'
 require 'obs_deploy/version'
 require 'obs_deploy/check_diff'
 require 'obs_deploy/ssh'
+require 'obs_deploy/zypper'
+require 'obs_deploy/systemctl'
 
 module ObsDeploy
   class Error < StandardError; end
-  class Systemctl
-    class << self
-      def status
-        'systemctl status obs-api-support.target'
-      end
-
-      def list_dependencies
-        'systemctl list-dependencies obs-api-support.target'
-      end
-    end
-  end
-
-  class Zypper
-    def update(dry_run: true)
-      if dry_run
-        run ['zypper'] + update_params + dry_run_params + package_name
-      else
-        run ['zypper'] + update_params + package_name
-      end
-    end
-
-    def refresh
-      run ['zypper', '--non-interactive', '--gpg-auto-import-keys', 'refresh']
-    end
-
-    private
-
-    def run(params)
-      params
-    end
-
-    def package_name
-      ['obs-api']
-    end
-
-    def update_params
-      ['--non-interactive', 'update', '--best-effort', '--details']
-    end
-
-    def dry_run_params
-      ['--dry-run --download-only']
-    end
-  end
 end

data/lib/obs_deploy/cli/commands.rb

@@ -9,6 +9,7 @@ module ObsDeploy
       autoload :Deploy, File.join(__dir__, 'commands/deploy.rb')
       autoload :GetPackageVersion,  File.join(__dir__, 'commands/get_package_version.rb')
       autoload :GetDeployedVersion, File.join(__dir__, 'commands/get_deployed_version.rb')
+      autoload :Systemctl, File.join(__dir__, 'commands/systemctl.rb')
 
       # register the commands and its command line
       register 'available-package', GetPackageVersion
@@ -16,6 +17,7 @@ module ObsDeploy
       register 'version', Version, aliases: ['v', '-v', '--version']
       register 'deploy', Deploy
       register 'refresh-repositories', RefreshRepositories
+      register 'systemctl', Systemctl
     end
   end
 end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'pry'
+module ObsDeploy
+  module CLI
+    module Commands
+      class Systemctl < Dry::CLI::Command
+        desc 'run systemd commands to verify application state'
+
+        option :user, type: :string, default: 'root', desc: 'User'
+        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:, host:, port:, **)
+          ssh_driver = ObsDeploy::SSH.new(user: user, server: host, port: port)
+          ssh_driver.run(ObsDeploy::Systemctl.new.status)
+          ssh_driver.run(ObsDeploy::Systemctl.new.list_dependencies)
+        end
+      end
+    end
+  end
+end

data/lib/obs_deploy/ssh.rb

@@ -9,6 +9,7 @@ module ObsDeploy
       @server = opts[:server] || 'localhost'
       @port = opts[:port] || 22
       @identity_file = opts[:identity_file]
+      @debug = opts[:debug] || false
     end
 
     def build_command
@@ -18,9 +19,15 @@ module ObsDeploy
     end
 
     def run(cmd)
-      results, errors = Cheetah.run(build_command + cmd, stdout: :capture, stderr: :capture)
-      puts results
-      puts errors
+      Cheetah.run(build_command + cmd, logger: logger)
+    end
+
+    def logger
+      Logger.new(STDOUT, level: logger_level)
+    end
+
+    def logger_level
+      @debug ? Logger::DEBUG : Logger::INFO
     end
   end
 end

data/lib/obs_deploy/version.rb

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

data/lib/obs_deploy/zypper.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ObsDeploy
+  class Zypper
+    def update(dry_run: true)
+      if dry_run
+        run ['zypper'] + update_params + dry_run_params + package_name
+      else
+        run ['zypper'] + update_params + package_name
+      end
+    end
+
+    def refresh
+      run ['zypper', '--non-interactive', '--gpg-auto-import-keys', 'refresh']
+    end
+
+     private
+
+    def run(params)
+      params
+    end
+
+    def package_name
+      ['obs-api']
+    end
+
+    def update_params
+      ['--non-interactive', 'update', '--best-effort', '--details']
+    end
+
+    def dry_run_params
+      ['--dry-run --download-only']
+    end
+   end
+end

data/lib/systemctl.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ObsDeploy
+  class Systemctl
+    def status
+      run ['systemctl'] + ['status'] + target
+    end
+
+    def list_dependencies
+      run ['systemctl'] + ['list-dependencies'] + target
+    end
+
+    private
+
+    def target
+      ['obs-api-support.target']
+    end
+
+    def run(params)
+      params + ['--no-pager']
+    end
+  end
+end

data/obs_deploy.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Victor Pereira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -159,6 +160,7 @@ files:
 - bin/setup
 - dist/Makefile
 - dist/rubygem-obs_deploy.spec
+- entrypoint.sh
 - lib/obs_deploy.rb
 - lib/obs_deploy/check_diff.rb
 - lib/obs_deploy/cli/commands.rb
@@ -166,9 +168,12 @@ files:
 - lib/obs_deploy/cli/commands/get_deployed_version.rb
 - lib/obs_deploy/cli/commands/get_package_version.rb
 - lib/obs_deploy/cli/commands/refresh_repositories.rb
+- lib/obs_deploy/cli/commands/systemctl.rb
 - lib/obs_deploy/cli/commands/version.rb
 - lib/obs_deploy/ssh.rb
 - lib/obs_deploy/version.rb
+- lib/obs_deploy/zypper.rb
+- lib/systemctl.rb
 - obs_deploy.gemspec
 homepage: https://openbuildservice.org
 licenses: []