quickmox 0.2.0 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51ff987bfc392ddaed3e9244f1a665ee22548ac4
+  data.tar.gz: 1c4307e709e15702d0ac997892bc1df33d3f4e67
+SHA512:
+  metadata.gz: 1287f3d4557a7b5526611dc3e4bf166c78af3be8f1864c43775e400dceb87e280dfc30152d192994ae9b88ef13bff86cb6b07c5f00ed394f6408f03cedee29d1
+  data.tar.gz: 859c576eeebdc1b538d71a2de7c6ff65058b1f324afbcfe92b6c64065d49414530708911450b8fb44860c3f22ea5b6ae0dc2c3c4ee764b7ae3c66912d62035b7

data/README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/jkvalk/quickmox.svg?branch=master)](https://travis-ci.org/jkvalk/quickmox)
 [![Gem Version](https://badge.fury.io/rb/quickmox.svg)](http://badge.fury.io/rb/quickmox)
 [![Coverage Status](https://coveralls.io/repos/jkvalk/quickmox/badge.svg?branch=master)](https://coveralls.io/r/jkvalk/quickmox?branch=master)
+[![Code Climate](https://codeclimate.com/github/jkvalk/quickmox/badges/gpa.svg)](https://codeclimate.com/github/jkvalk/quickmox)
 
 # Quickmox
 
@@ -28,11 +29,9 @@ Or install it yourself as:
 require 'quickmox'
 include Quickmox
 
-hostname = 'host1.example.com'
-user = 'root'
-pass = 's3cr3t'
-
-host = Host.new(hostname: hostname, username: user, password: pass).connect
+host = Host.new( SSHTransport.new('hostname','username','password') )
+    .connect
+    .scan
 
 p host.localname
 p host.uptime
@@ -51,9 +50,7 @@ host.disconnect
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-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).
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rspec spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ## Contributing
 

data/lib/quickmox/guest.rb

@@ -36,27 +36,30 @@ module Quickmox
     end
 
     def scan
-      host.exec("qm config #{id}").split("\n").each do |line|
-        if line =~ /net0:.*=([0-9A-Fa-f:]{17}),/
-          params[:mac] = $1
-          params[:mac] = params[:mac].gsub(':', '').downcase
-        elsif line =~ /cores: ([0-9]{1,3})/
-          params[:cores] = $1
-        elsif line =~ /bootdisk: (.*)/
-          params[:bootdisk] = $1
-        elsif line =~ /description: (.*)/
-          params[:description] = $1
-        elsif line =~ /memory: ([0-9]{1,6})/
-          params[:memory] = $1
-        elsif line =~ /name: (.*)/
-          params[:name] = $1
-        elsif line =~ /onboot: ([0-9])/
-          params[:onboot] = $1
-        elsif line =~ /(scsi|virtio|ide)[0-9]{1,3}: .*size=([0-9]{1,3}[MGTK])/
-          params[:disk] = $2
+      config_lines.each do |line|
+        case line
+          when /net0:.*=([0-9A-Fa-f:]{17}),/
+            params[:mac] = $1
+            params[:mac] = params[:mac].gsub(':', '').downcase
+          when /cores: ([0-9]{1,3})/
+            params[:cores] = $1
+          when /(description|name|bootdisk): (.*)/
+            params[$1.to_sym] = $2
+          when /memory: ([0-9]{1,6})/
+            params[:memory] = $1
+          when /onboot: ([0-9])/
+            params[:onboot] = $1
+          when /(scsi|virtio|ide)[0-9]{1,3}: .*size=([0-9]{1,3}[MGTK])/
+            params[:disk] = $2
         end
       end
       self
     end
+
+    private
+
+    def config_lines
+      host.exec("qm config #{id}").split("\n")
+    end
   end
 end

data/lib/quickmox/guestlist.rb

@@ -1,12 +1,12 @@
 class Guestlist < Array
 
-    def find(id)
-      self.each do |el|
-        if el.id.eql?(id.to_s)
-          return el
-        end
+  def find(id)
+    self.each do |el|
+      if el.id.eql?(id.to_s)
+        return el
       end
     end
+  end
 
   def scan
     self.each do |el|

data/lib/quickmox/host.rb

@@ -19,30 +19,19 @@ module Quickmox
                   :session,
                   :guests
 
-    def initialize(opts = {})
-      @hostname = opts[:hostname]
-      @username = opts[:username]
-      @password = opts[:password]
+    def initialize(transport)
+      @session = transport
+      @guests = Guestlist.new
+
       begin
-        @ip = Resolv.getaddress(@hostname)
+        @ip = Resolv.getaddress(@session.host)
       rescue => e
         @ip = String.new
       end
-      @guests = Guestlist.new
     end
 
     def connect
-      begin
-        @session = Net::SSH.start(hostname,
-                                  username,
-                                  password: password,
-                                  auth_methods: %w(password),
-                                  number_of_password_prompts: 0,
-                                  timeout: 3)
-
-      rescue => e
-        raise HostError, "Warning: exception while connecting to host #{hostname}: #{e}"
-      end
+      @session.connect
       self
     end
 
@@ -59,7 +48,7 @@ module Quickmox
 
     def guestlist
       list = Array.new
-      table = handle_exceptions { session.exec!('qm list') }
+      table = session.exec!('qm list')
       lines = table.split("\n")
       lines.each do |line|
         if line =~ /^ *([0-9]{1,4}) */
@@ -70,15 +59,11 @@ module Quickmox
     end
 
     def localname
-      handle_exceptions do
         session.exec!('hostname').chomp
-      end
     end
 
     def uptime
-      handle_exceptions do
         session.exec!('uptime').chomp
-      end
     end
 
     def close
@@ -86,33 +71,18 @@ module Quickmox
     end
 
     def disconnect
-      begin
         session.close
-      rescue => e
-        raise HostError, "Warning: exception while disconnecting from host #{hostname}: #{e.to_s}"
-      end
     end
 
     def is_proxmox?
-      handle_exceptions do
         output = session.exec!('qm list')
         (output =~ /VMID NAME/) ? true : false
-      end
     end
 
     def exec(cmd)
-      handle_exceptions do
-        return session.exec!(cmd).chomp
-      end
+      session.exec!(cmd).chomp
     end
 
-    private
-    def handle_exceptions
-      begin
-        yield
-      rescue => e
-        raise HostError, "Exception while talking to host #{hostname}: #{e.to_s}"
-      end
-    end
+
   end
 end

data/lib/quickmox/ssh_transport.rb

@@ -0,0 +1,52 @@
+module Quickmox
+
+  class SSHTransport
+
+    class SSHTransportError < StandardError
+    end
+
+    attr_accessor :session, :host, :user, :pass
+
+    def initialize(host, user, pass)
+      @host = host
+      @user = user
+      @pass = pass
+    end
+
+    def connect
+      handle_exceptions do
+        @session = Net::SSH.start(host,
+                                  user,
+                                  password: pass,
+                                  auth_methods: %w(password),
+                                  number_of_password_prompts: 0,
+                                  timeout: 3)
+      end
+      self
+    end
+
+    def close
+      handle_exceptions do
+        session.close
+      end
+    end
+
+    def exec!(cmd)
+      handle_exceptions do
+        session.exec!(cmd).chomp
+      end
+
+    end
+
+    private
+
+    def handle_exceptions
+      begin
+        yield
+      rescue => e
+        raise SSHTransportError, "Exception while talking to host #{host}: #{e}"
+      end
+    end
+
+  end
+end

data/lib/quickmox/version.rb

@@ -1,3 +1,3 @@
 module Quickmox
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/quickmox.rb

@@ -1,7 +1,8 @@
-require "quickmox/version"
-require "quickmox/host"
-require "quickmox/guest"
-require "quickmox/guestlist"
+require 'quickmox/version'
+require 'quickmox/host'
+require 'quickmox/guest'
+require 'quickmox/guestlist'
+require 'quickmox/ssh_transport'
 
 module Quickmox
 end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: quickmox
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - J.K.Valk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 description: This is VERY raw, version 1.0.0 is expected to be first usable implementation.
@@ -146,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -160,32 +143,32 @@ files:
 - lib/quickmox/guest.rb
 - lib/quickmox/guestlist.rb
 - lib/quickmox/host.rb
+- lib/quickmox/ssh_transport.rb
 - lib/quickmox/version.rb
 - quickmox.gemspec
 homepage: https://github.com/jkvalk/quickmox
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Quickmox is a Ruby gem for managing Proxmox hosts by SSH screen-scraping
   techniques.
 test_files: []