obs_deploy 0.1.5.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4798a9c1a23588f592ece94a94dfcee1dac459d237598c122df822971a1e7b7
-  data.tar.gz: 3e1846ac458799ba4fc2ae9802b87ac96fa2814ed43da4a2a24002729d18ea8b
+  metadata.gz: a671e53bbfc49281a52dfc32edc85bf74dddb20fd45034a6f3118aa60cd7693e
+  data.tar.gz: e8a2fa4883c4a2f182593c8c9b3bb2e4b02918047b6b5f3c6057520b963404c5
 SHA512:
-  metadata.gz: 97f6a466b3067ef2d92a48195247d1dd3d71f6c0e07f505b642e60d2a69b220351d13e2c50450a69978895cbf355976e0593474c708089dae5a502797c441f1e
-  data.tar.gz: 12b6f238b1ceb972cc8efa300e97facf480f995e137aa93ab0460a77958e067ca38ad7ecb1cb9acda8fce94ddaccf679c43d8e5e7d349011acfe9cc9d7b7405a
+  metadata.gz: 580a4c94c6769d977de4c1b91f40cf86f355e31c26027761ea24ebc82c0ba2c14cfe2161c4c36fa7b8c385fd4464bceb0dc766cc42a5e2c1c4736b52983e9a2d
+  data.tar.gz: 57dc7ee60f649e8a344d368d86d201001605a128319396319f833a170a3b0dbd545f96acf8e38279c33ea5b1bc77077aaf7c6ed139ecbedb024d5e2867a5c2aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    obs_deploy (0.1.5.1)
+    obs_deploy (0.2.0)
       cheetah
       dry-cli
       nokogiri

data/README.md

@@ -2,6 +2,10 @@
 
 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)
+
+
 ## Installation
 
 Just run:
@@ -23,8 +27,22 @@ zypper in  ruby2.6-rubygem-obs_deploy
 
 ### To deploy
 
+As default it will run in `dry-run` mode (no changes are made)
+
+#### dry-run:
+
 `obs_deploy deploy --user root --host localhost`
 
+or 
+
+`obs_deploy deploy --user root --host localhost --dry-run`
+
+### deploy
+
+`obs_deploy deploy --user root --host localhost --no-dry-run`
+
+
+
 ### To check which version is deployed
 
 `obs_deploy deployed-version [--host <server>]`
@@ -33,10 +51,6 @@ zypper in  ruby2.6-rubygem-obs_deploy
 
 `obs_deploy available-package [<product>] [<package-name>]`
 
-### Deploy dry-run
-
-`obs_deploy deploy --user root --host localhost --dry-run`
-
 ### Refresh Zypper repositories
 
 `obs_deploy refresh-repositories`

data/dist/_service

@@ -0,0 +1,4 @@
+<services>
+ <service name="download_files">
+ </service>
+</services>

data/dist/rubygem-obs_deploy.spec

@@ -20,7 +20,7 @@
 %define mod_full_name %{mod_name}-%{version}
 %define rb_suffix         ruby2.6
 Name:           rubygem-obs_deploy
-Version:        0.1.5
+Version:        0.2.0
 Release:        0
 Summary:        OBS Deployment tool
 License:        MIT

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

@@ -7,14 +7,14 @@ module ObsDeploy
         desc 'Deploy obs-api'
 
         option :user, type: :string, default: 'root', desc: 'User'
-        option :dry_run, type: :bool, default: true, desc: 'Dry run'
+        option :dry_run, type: :boolean, 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
-          ssh_driver.run(zypper.update(dry_run: dry_run))
+          zypper = ObsDeploy::Zypper.new(dry_run: dry_run)
+          ssh_driver.run(zypper.update)
         end
       end
     end

data/lib/obs_deploy/ssh.rb

@@ -13,21 +13,48 @@ module ObsDeploy
     end
 
     def build_command
-      command_line = ['-tt', "#{@user}@#{@server}", '-p', @port.to_s]
-      command_line << ['-i', @identity_file] if @identity_file
-      ['ssh'] + command_line.flatten
+      ['ssh'] + basic_connection_string + identity + ssh_port
     end
 
     def run(cmd)
       Cheetah.run(build_command + cmd, logger: logger)
     end
 
+    private
+
+    # -t Force pseudo-tty allocation.
+    # This can be used to execute arbitrary screen-based programs on a
+    # remote machine, which can be very useful, e.g. when implementing menu services.
+    # Multiple -t
+    # options force tty allocation, even if ssh has no local tty.
+    def ssh_tt
+      ['-tt']
+    end
+
+    def identity
+      @identity_file ? ['-i', @identity_file] : []
+    end
+
+    def basic_connection_string
+      ssh_tt + [[@user, '@', @server].join]
+    end
+
+    def ssh_port
+      @port && @port != 22 ? ['-p', @port.to_s] : []
+    end
+
     def logger
-      Logger.new(STDOUT, level: logger_level)
+      Logger.new(STDOUT, level: logger_level, formatter: logger_formatter)
     end
 
     def logger_level
       @debug ? Logger::DEBUG : Logger::INFO
     end
+
+    def logger_formatter
+      proc do |severity, datetime, progname, msg|
+        "#{severity} - #{msg}\n"
+      end
+    end
   end
 end

data/lib/obs_deploy/version.rb

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

data/lib/obs_deploy/zypper.rb

@@ -2,12 +2,14 @@
 
 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
+    attr_accessor :dry_run
+
+    def initialize(dry_run: true, package_name: 'obs-api')
+      @dry_run = dry_run
+    end
+
+    def update
+      run ['zypper'] + update_string + package_name
     end
 
     def refresh
@@ -20,6 +22,14 @@ module ObsDeploy
       params
     end
 
+    def update_string
+      if @dry_run
+        update_params + dry_run_params
+      else
+        update_params
+      end
+    end
+
     def package_name
       ['obs-api']
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obs_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.5.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Victor Pereira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,6 +159,7 @@ files:
 - bin/obs_deploy
 - bin/setup
 - dist/Makefile
+- dist/_service
 - dist/rubygem-obs_deploy.spec
 - entrypoint.sh
 - lib/obs_deploy.rb