marhan_cli 0.0.11 → 0.0.12

data/Changelog.md

@@ -44,4 +44,9 @@
 ## v0.0.11
 
 * First RSpec tests and guard added for TDD development.
-* VirtualBox command for start and stop virtual guest systems added. (command => vbox:[start|stop])
+* VirtualBox command for start and stop virtual guest systems added. (command => vbox:[start|stop])
+
+## v0.0.12
+
+* VirtualBox command connects automaticaly to ssh server, if guest configuration has 'ssh' connection data. (command => vbox:start)
+* 'VBoxManage controlvm ' uses 'acpipowerbutton' instead of 'poweroff', now. (command => vbox:stop)

data/Guardfile

@@ -1,5 +1,5 @@
 guard 'rspec' do
-  watch(%r{^spec/(.+)\.rb$})
-  watch(%r{^lib/(.+)\.rb$})
+  watch(%r{^spec/.+}) {"spec"}
+  watch(%r{^lib/.+}) {"spec"}
 end
 

data/lib/marhan_cli/{app/true_crypt_app.rb → apps/true_crypt.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module MarhanCli
-  class TrueCryptApp
+  class TrueCrypt
 
     def initialize(mount_folder = nil)
       @binary = "/Applications/TrueCrypt.app/Contents/MacOS/TrueCrypt"

data/lib/marhan_cli/apps/virtual_box.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+require 'net/ssh'
+require 'marhan_cli/helper/constraint'
+require 'marhan_cli/network/remote_machine'
+
+module MarhanCli
+  class VirtualBox
+
+    attr_reader :guests
+
+    def initialize(guests)
+      @guests = guests
+    end
+
+    def start_guest(guest_config_name)
+      "VBoxManage startvm '#{vbox_name(guest_config_name)}'"
+    end
+
+    def stop_guest(guest_config_name)
+      "VBoxManage controlvm '#{vbox_name(guest_config_name)}' acpipowerbutton"
+    end
+
+    def guest_ssh_server_up?(guest_config_name)
+      remote_machine = RemoteMachine.new("localhost", "2222")
+      remote_machine.ssh_server_running?("markus")
+    end
+
+    def vbox_name(guest_config_name)
+      Constraint.not_nil_or_empty! guest_config_name, "Guest config name have to be set!"
+      Constraint.not_nil_or_empty! @guests[guest_config_name], "No guest with key '#{guest_config_name}' found in configuration!"
+      Constraint.not_nil_or_empty! @guests[guest_config_name].name, "Guest name is not configured!"
+      @guests[guest_config_name].name
+    end
+  end
+end

data/lib/marhan_cli/command.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require "thor"
-require "ambience"
+require 'marhan_cli/config'
 
 module MarhanCli
   class Command < Thor
@@ -8,8 +8,6 @@ module MarhanCli
 
     protected
 
-    CONFIG_FILE = ".marhan_cli.yml"
-
     def execute(proc)
       begin
         say ""
@@ -29,12 +27,7 @@ module MarhanCli
     end
 
     def load_config
-      config_file_path = File.join(File.expand_path("~/"), CONFIG_FILE)
-      unless File.exists?(config_file_path)
-        raise "Stop processing! Command needs the configuration file '#{CONFIG_FILE}' in you're home directory."
-      end
-      config = Ambience.create(config_file_path)
-      config.to_mash
+      MarhanCli::Config.init
     end
 
     def get_or_ask(option_name)

data/lib/marhan_cli/commands/{network.rb → network_command.rb}

@@ -3,7 +3,7 @@ require 'marhan_cli/network/remote_machine'
 require 'marhan_cli/command'
 
 module MarhanCli
-  class Network < MarhanCli::Command
+  class NetworkCommand < MarhanCli::Command
 
     namespace :net
 

data/lib/marhan_cli/commands/{true_crypt.rb → true_crypt_command.rb}

@@ -1,9 +1,9 @@
 # encoding: utf-8
 require 'marhan_cli/command'
-require 'marhan_cli/app/true_crypt_app'
+require 'marhan_cli/apps/true_crypt'
 
 module MarhanCli
-  class TrueCrypt < MarhanCli::Command
+  class TrueCryptCommand < MarhanCli::Command
 
     namespace :crypt
 
@@ -40,7 +40,7 @@ module MarhanCli
     def mount_proc
       Proc.new do
         config = load_crypt_config
-        true_crypt = TrueCryptApp.new(config.mount_folder)
+        true_crypt = TrueCrypt.new(config.mount_folder)
         device = get_or_ask(:device)
         run true_crypt.mount_command(config.encrypted_devices[device], device)
       end
@@ -49,7 +49,7 @@ module MarhanCli
     def unmount_proc
       Proc.new do
         config = load_crypt_config
-        true_crypt = TrueCryptApp.new(config.mount_folder)
+        true_crypt = TrueCrypt.new(config.mount_folder)
         device = get_or_ask(:device)
         run true_crypt.unmount_command(device)
       end
@@ -57,7 +57,7 @@ module MarhanCli
 
     def unmount_all_proc
       Proc.new do
-        true_crypt = TrueCryptApp.new
+        true_crypt = TrueCrypt.new
         run true_crypt.unmount_all_command
       end
     end

data/lib/marhan_cli/commands/{vbox.rb → vbox_command.rb}

@@ -1,9 +1,9 @@
 # encoding: utf-8
 require 'marhan_cli/command'
-require 'marhan_cli/app/virtual_box_app'
+require 'marhan_cli/apps/virtual_box'
 
 module MarhanCli
-  class VBox < MarhanCli::Command
+  class VBoxCommand < MarhanCli::Command
 
     namespace :vbox
 
@@ -31,21 +31,35 @@ module MarhanCli
 
     private
 
+    def start_ssh_client
+
+    end
+
     def start_guest
       Proc.new do
-        config = load_vbox_config
-        virtual_box = VirtualBoxApp.new(config.guests)
+        vbox_config = load_vbox_config
+        virtual_box = VirtualBox.new(vbox_config.guests)
         guest_to_start = get_or_ask(:guest)
         run virtual_box.start_guest(guest_to_start)
+
+        if vbox_config.guests[guest_to_start].key?(:ssh)
+          say ""
+          say "Waiting for response from SSH server...", :green
+          if virtual_box.guest_ssh_server_up?(guest_to_start)
+            say "SSH server is up. Trying to connect...", :green
+            say ""
+            run "ssh -p 2222 localhost"
+          end
+        end
       end
     end
 
     def stop_guest
       Proc.new do
         config = load_vbox_config
-        virtual_box = VirtualBoxApp.new(config.guests)
-        guest_to_start = get_or_ask(:guest)
-        run virtual_box.stop_guest(guest_to_start)
+        guest_name = get_or_ask(:guest)
+        virtual_box = VirtualBox.new(config.guests)
+        run virtual_box.stop_guest(guest_name)
       end
     end
 

data/lib/marhan_cli/commands/{web.rb → web_command.rb}

@@ -3,7 +3,7 @@ require 'net/http'
 require 'marhan_cli/command'
 
 module MarhanCli
-  class Web < MarhanCli::Command
+  class WebCommand < MarhanCli::Command
 
     namespace :web
 

data/lib/marhan_cli/config.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require "ambience"
+
+module MarhanCli
+  class Config
+
+    def self.init(config_file = nil)
+      @config_file = config_file || default_config_file
+      load_config(@config_file)
+    end
+
+    def self.load_config(config_file)
+      unless File.exists?(config_file)
+        raise "Stop processing! Command needs the configuration file '#{config_file}' in you're home directory."
+      end
+      begin
+        Ambience.create(config_file).to_mash
+      rescue Exception => e
+        raise "Configuration file could not pared: #{e}"
+      end
+
+    end
+
+    def self.default_config_file
+      File.join(File.expand_path("~/"), ".marhan_cli.yml")
+    end
+
+  end
+end

data/lib/marhan_cli/network/remote_machine.rb

@@ -26,7 +26,40 @@ module MarhanCli
         end
 
         raise RemoteMachineError, "#{stderr}" unless stderr.empty?
+      end
+    end
+
+    def wait_for_ssh_server_status(user)
+      Net::SSH.start(@home, user, :port => @port) do |ssh|
+        status = "";
+        channel = ssh.open_channel do |ch|
+          ch.exec "status ssh" do |ch, success|
+            raise "could not execute command" unless success
+            ch.on_data do |c, data|
+              status << data
+            end
+            ch.on_extended_data do |c, type, data|
+              $STDERR.print data
+            end
+          end
+        end
+        channel.wait
+        return status
+      end
+    end
 
+    def ssh_server_running?(user)
+      status = wait_for_ssh_server_status(user)
+      status.match(%r{ssh start/running.+})
+    end
+
+    def exec_remote_command(user, remote_command)
+      Net::SSH.start(@host, user, :port => @port) do |ssh|
+        stderr = ""
+        ssh.exec!(remote_command) do |channel, stream, data|
+          stderr << data if stream == :stderr
+        end
+        raise RemoteMachineError, "#{stderr}" unless stderr.empty?
       end
     end
   end

data/lib/marhan_cli/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module MarhanCli
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/integration/marhan_cli/apps/virtual_box_scene.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'marhan_cli/apps/virtual_box'
+
+describe "VirtualBoxApp" do
+
+  let(:config_param) { Hashie::Mash.new(:linux => 'Ubuntu Linux') }
+  let(:subject) { MarhanCli::VirtualBox.new(config_param) }
+
+  context ".guest_ssh_server_up?" do
+    describe "when system is running" do
+      it "returns true" do
+        subject.guest_ssh_server_up?("linux").should be_true
+      end
+    end
+  end
+
+  context ".shutdown_guest_system" do
+    describe "when system is running" do
+      it "system shutdown" do
+        subject.shutdown_guest_system("linux").should be_true
+      end
+    end
+  end
+end

data/spec/unit/fixtures/config.yml

@@ -0,0 +1,14 @@
+crypt:
+  mount_folder: /Volumes
+  encrypted_devices:
+    hdd: /dev/rdisk2s2
+vbox:
+  guests:
+    linux:
+      name: Ubuntu Linux
+      ssh:
+        user: markus
+        host: localhost
+        port: 2222
+    windows:
+      name: Windows XP

data/spec/{marhan_cli/app/virtual_box_app_spec.rb → unit/lib/marhan_cli/apps/virtual_box_spec.rb}

@@ -1,22 +1,23 @@
 # encoding: utf-8
 require 'spec_helper'
-require 'marhan_cli/app/virtual_box_app'
+require 'marhan_cli/apps/virtual_box'
+require 'marhan_cli/config'
 
 describe "VirtualBoxApp" do
 
-  let(:config_param) { Hashie::Mash.new(:linux => 'Ubuntu Linux') }
+  let(:config_param) { MarhanCli::Config.init(
+      File.join("spec", "unit", "fixtures", "config.yml")).vbox.guests }
+
+  let(:subject) { MarhanCli::VirtualBox.new(config_param) }
 
   context ".new" do
     describe "with empty hash as argument" do
-      let(:subject) { MarhanCli::VirtualBoxApp.new({}) }
       it "creates a new objects" do
-        subject.should be_a(MarhanCli::VirtualBoxApp)
+        subject.should be_a(MarhanCli::VirtualBox)
       end
     end
 
     describe "with config hash as argument" do
-      let(:subject) { MarhanCli::VirtualBoxApp.new(config_param) }
-
       it "has set config hash" do
         subject.guests.should eq(config_param)
       end
@@ -24,8 +25,6 @@ describe "VirtualBoxApp" do
   end
 
   context ".start_guest" do
-    let(:subject) { MarhanCli::VirtualBoxApp.new(config_param) }
-
     describe "with configured guest as argument" do
       it "returns correct command" do
         subject.start_guest('linux').should eq("VBoxManage startvm 'Ubuntu Linux'")
@@ -35,8 +34,6 @@ describe "VirtualBoxApp" do
   end
 
   context ".vbox_name" do
-    let(:subject) { MarhanCli::VirtualBoxApp.new(config_param) }
-
     describe "with configured guest as argument" do
       it "returns correct command" do
         subject.vbox_name('linux').should eq('Ubuntu Linux')
@@ -49,7 +46,7 @@ describe "VirtualBoxApp" do
           subject.vbox_name('minix')
         }.to raise_error(
                  error=ArgumentError,
-                 message="No guest with key 'minix' found in configuration")
+                 message="No guest with key 'minix' found in configuration!")
       end
     end
 
@@ -65,14 +62,10 @@ describe "VirtualBoxApp" do
   end
 
   context ".stop_guest" do
-
-    let(:subject) { MarhanCli::VirtualBoxApp.new(config_param) }
-
     describe "with configured guest as argument" do
       it "returns correct command" do
-        subject.stop_guest('linux').should eq("VBoxManage controlvm 'Ubuntu Linux' poweroff")
+        subject.stop_guest('linux').should eq("VBoxManage controlvm 'Ubuntu Linux' acpipowerbutton")
       end
     end
   end
-
 end

data/spec/unit/lib/marhan_cli/config_spec.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'marhan_cli/config'
+
+describe "Config" do
+
+  context "self.init" do
+    let(:subject) { MarhanCli::Config.init(
+        File.join("spec", "unit", "fixtures", "config.yml")) }
+
+    describe "returns config" do
+      it "as Hashie::Mash" do
+        subject.should be_a(Hashie::Mash)
+      end
+    end
+
+    describe "returns TrueCrypt config" do
+
+      let(:crypt) { subject.crypt }
+
+      it "with with mount_folder" do
+        crypt.mount_folder.should eq("/Volumes")
+      end
+
+      it "with with encrypted_devices" do
+        crypt.encrypted_devices.hdd.should eq("/dev/rdisk2s2")
+      end
+    end
+
+    describe "returns VirtualBox config" do
+      let(:vbox) { subject.vbox }
+      it "with 'Ubuntu' for guests.linux.name" do
+        vbox.guests.linux.name.should eq("Ubuntu Linux")
+      end
+
+      it "with 'Ubuntu' for guests['linux'].name" do
+        vbox.guests['linux'].name.should eq("Ubuntu Linux")
+      end
+
+      it "with 'localhost' for guests.linux.ssh.host" do
+        vbox.guests.linux.ssh.host.should eq("localhost")
+      end
+
+      it "with 'markus' for guests.linux.ssh.user" do
+        vbox.guests.linux.ssh.user.should eq("markus")
+      end
+
+      it "with 'nil' for guests.windows.ssh.nil?" do
+        vbox.guests.windows.key?(:ssh).should be_false
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marhan_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -141,21 +141,25 @@ files:
 - Rakefile
 - bin/mcli
 - lib/marhan_cli.rb
-- lib/marhan_cli/app/true_crypt_app.rb
-- lib/marhan_cli/app/virtual_box_app.rb
+- lib/marhan_cli/apps/true_crypt.rb
+- lib/marhan_cli/apps/virtual_box.rb
 - lib/marhan_cli/command.rb
-- lib/marhan_cli/commands/network.rb
-- lib/marhan_cli/commands/true_crypt.rb
-- lib/marhan_cli/commands/vbox.rb
-- lib/marhan_cli/commands/web.rb
+- lib/marhan_cli/commands/network_command.rb
+- lib/marhan_cli/commands/true_crypt_command.rb
+- lib/marhan_cli/commands/vbox_command.rb
+- lib/marhan_cli/commands/web_command.rb
+- lib/marhan_cli/config.rb
 - lib/marhan_cli/helper/constraint.rb
 - lib/marhan_cli/network/errors.rb
 - lib/marhan_cli/network/remote_machine.rb
 - lib/marhan_cli/version.rb
 - marhan_cli.gemspec
-- spec/marhan_cli/app/virtual_box_app_spec.rb
-- spec/marhan_cli/helper/constraint_spec.rb
+- spec/integration/marhan_cli/apps/virtual_box_scene.rb
 - spec/spec_helper.rb
+- spec/unit/fixtures/config.yml
+- spec/unit/lib/marhan_cli/apps/virtual_box_spec.rb
+- spec/unit/lib/marhan_cli/config_spec.rb
+- spec/unit/lib/marhan_cli/helper/constraint_spec.rb
 homepage: https://github.com/marhan/marhan_cli
 licenses: []
 post_install_message: 
@@ -181,6 +185,9 @@ signing_key:
 specification_version: 3
 summary: Helper routines for my computers
 test_files:
-- spec/marhan_cli/app/virtual_box_app_spec.rb
-- spec/marhan_cli/helper/constraint_spec.rb
+- spec/integration/marhan_cli/apps/virtual_box_scene.rb
 - spec/spec_helper.rb
+- spec/unit/fixtures/config.yml
+- spec/unit/lib/marhan_cli/apps/virtual_box_spec.rb
+- spec/unit/lib/marhan_cli/config_spec.rb
+- spec/unit/lib/marhan_cli/helper/constraint_spec.rb

data/lib/marhan_cli/app/virtual_box_app.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require 'marhan_cli/helper/constraint'
-
-module MarhanCli
-  class VirtualBoxApp
-
-    attr_reader :guests
-
-    def initialize(guests)
-      @guests = guests
-    end
-
-    def start_guest(guest_config_name)
-      "VBoxManage startvm '#{vbox_name(guest_config_name)}'"
-    end
-
-    def stop_guest(guest_config_name)
-      "VBoxManage controlvm '#{vbox_name(guest_config_name)}' poweroff"
-    end
-
-    def vbox_name(guest_config_name)
-      Constraint.not_nil_or_empty! guest_config_name, "Guest config name have to be set!"
-      vbox_name = @guests[guest_config_name]
-      Constraint.not_nil_or_empty! vbox_name, "No guest with key '#{guest_config_name}' found in configuration"
-      vbox_name
-    end
-  end
-end