prlbackup 1.1.1 → 1.1.2

data/bin/prlbackup

@@ -2,4 +2,4 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'prlbackup'
 
-PrlBackup::CLI.run
+PrlBackup::CLI.start

data/lib/prlbackup/cli.rb

@@ -45,16 +45,16 @@ module PrlBackup
 
     class << self
       # Run the backups with given options and arguments.
-      def run
-        self.new.run(ARGV)
+      def start
+        self.new.start(ARGV)
       end
     end
 
     # Parse options and create safe backups for the selected virtual machines.
-    def run(argv)
+    def start(argv)
       parse_options!(argv)
       selected_virtual_machines.each do |vm|
-        vm.safe_backup
+        vm.safely_backup
         vm.cleanup if config[:keep_only]
       end
     end

data/lib/prlbackup/version.rb

@@ -1,3 +1,3 @@
 module PrlBackup
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/prlbackup/virtual_machine.rb

@@ -16,7 +16,7 @@ module PrlBackup
       # @return [Array<VirtualMachine>]
       def all
         cmd = %w{prlctl list --all --output uuid}
-        command(*cmd).split("\n").grep(/(\{[a-f0-9-]+\})/) { new($1) }
+        run(*cmd).split("\n").grep(/(\{[a-f0-9-]+\})/) { new($1) }
       end
     end
 
@@ -32,7 +32,7 @@ module PrlBackup
 
     # Safely backup the virtual machine.
     # @note A running virtual machine will be stopped during the backup!
-    def safe_backup(full=false)
+    def safely_backup(full=false)
       stopped? ? backup : (stop; backup; start)
     end
 
@@ -72,25 +72,25 @@ module PrlBackup
 
     # Start the virtual machine.
     def start
-      command!('prlctl', 'start', uuid)
+      conditionally_run('prlctl', 'start', uuid)
     end
 
     # Stop the virtual machine.
     def stop
-      command!('prlctl', 'stop', uuid)
+      conditionally_run('prlctl', 'stop', uuid)
     end
 
     # Backup the virtual machine.
     def backup
       cmd = ['prlctl', 'backup', uuid]
       cmd << '--full' if config[:full]
-      command!(*cmd)
+      conditionally_run(*cmd)
     end
 
     # Update and return info string for the virtual machine.
     # @return [String] infos
     def update_info
-      @info = command('prlctl', 'list', '--info', @name_or_uuid)
+      @info = run('prlctl', 'list', '--info', @name_or_uuid)
     end
 
     def stopped?
@@ -99,12 +99,12 @@ module PrlBackup
 
     # List of full backups for the virtual machine.
     def full_backups
-      command('prlctl', 'backup-list', uuid).split("\n").map { |l| $1 if l[/^\{[a-f0-9-]+\}\s+(\{[a-f0-9-]+\})[^(\.\d+)]/] }.compact
+      run('prlctl', 'backup-list', uuid).split("\n").map { |l| $1 if l[/^\{[a-f0-9-]+\}\s+(\{[a-f0-9-]+\})[^(\.\d+)]/] }.compact
     end
 
     # Delete the backup given by backup UUID.
     def delete_backup(backup_uuid)
-      command!('prlctl', 'backup-delete', '--tag', backup_uuid)
+      conditionally_run('prlctl', 'backup-delete', '--tag', backup_uuid)
     end
   end
 end

data/lib/prlbackup.rb

@@ -13,9 +13,9 @@ module PrlBackup
 
   # Run the command and log the last line from stdout unless --dry-run.
   # @return [String] stdout of the comand.
-  def command!(*args)
+  def conditionally_run(*args)
     unless PrlBackup.config[:dry_run]
-      output = command(*args)
+      output = run(*args)
       logger.info(output.split("\n").last)
     else
       output = ''
@@ -27,7 +27,7 @@ module PrlBackup
   # Run the command until it is finished.
   # @Note This will even run when option --dry-run is selected!
   # @return [String] stdout of the comand.
-  def command(*args)
+  def run(*args)
     logger.info("Running `#{args.shelljoin}`...") if PrlBackup.config[:verbose]
     output = `#{args.shelljoin} 2>&1`
     status = $?

data/spec/prlbackup/cli_spec.rb

@@ -2,28 +2,28 @@ require 'spec_helper'
 
 module PrlBackup
   describe CLI do
-    describe '.run' do
+    describe '.start' do
       before do
         @cli = double('cli')
-        @cli.stub(:run)
+        @cli.stub(:start)
         CLI.stub(:new).and_return(@cli)
       end
 
       it 'should initialize a new instance' do
         CLI.should_receive(:new).and_return(@cli)
-        CLI.run
+        CLI.start
       end
 
       it 'should run the new instance with ARGV' do
-        @cli.should_receive(:run).with(ARGV)
-        CLI.run
+        @cli.should_receive(:start).with(ARGV)
+        CLI.start
       end
     end
 
-    describe '#run' do
+    describe '#start' do
       before do
         @vm = double('vm')
-        @vm.stub(:safe_backup)
+        @vm.stub(:safely_backup)
         @vm.stub(:cleanup)
         VirtualMachine.stub(:new).and_return(@vm)
         @cli = CLI.new
@@ -35,21 +35,21 @@ module PrlBackup
         end
 
         it 'should backup each selected virtual machine' do
-          @vm.should_receive(:safe_backup).once
-          @cli.run %w[foo]
+          @vm.should_receive(:safely_backup).once
+          @cli.start %w[foo]
         end
 
         it 'should not perform cleanup actions' do
           @vm.should_not_receive(:cleanup)
-          @cli.run %w[foo]
+          @cli.start %w[foo]
         end
       end
 
       context 'with option --all' do
         it 'should backup all virtual machines' do
           VirtualMachine.should_receive(:all).and_return([@vm, @vm])
-          @vm.should_receive(:safe_backup).twice
-          @cli.run %w[--all]
+          @vm.should_receive(:safely_backup).twice
+          @cli.start %w[--all]
         end
       end
 
@@ -60,23 +60,23 @@ module PrlBackup
 
         it 'should not backup virtual machines which are given' do
           @cli.stub(:given_virtual_machines).and_return([@vm])
-          @vm.should_not_receive(:safe_backup)
-          @cli.run %w[--all --exclude foo]
+          @vm.should_not_receive(:safely_backup)
+          @cli.start %w[--all --exclude foo]
         end
 
         it 'should backup virtual machines which are not given' do
           @cli.stub(:given_virtual_machines).and_return([])
-          @vm.should_receive(:safe_backup).twice
-          @cli.run %w[--all --exclude foo]
+          @vm.should_receive(:safely_backup).twice
+          @cli.start %w[--all --exclude foo]
         end
       end
 
       context 'with option --keep-only' do
         it 'should perform cleanup actions after backing up' do
-          @vm.should_receive(:safe_backup).ordered
+          @vm.should_receive(:safely_backup).ordered
           @vm.should_receive(:cleanup).ordered
           @cli.stub(:config).and_return({:keep_only => 3})
-          @cli.run %w[foo]
+          @cli.start %w[foo]
         end
       end
     end

data/spec/prlbackup/virtual_machine_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module PrlBackup
   describe VirtualMachine do
     before do
-      VirtualMachine.any_instance.stub(:command).and_return('')
+      VirtualMachine.any_instance.stub(:run).and_return('')
       @uuid = '{deadbeef}'
       @vm = VirtualMachine.new('foo')
       @vm.stub(:uuid).and_return(@uuid)
@@ -33,25 +33,25 @@ module PrlBackup
 
       it 'should return a list of all virtual machines' do
         vm = mock('virtual_machine')
-        VirtualMachine.stub(:command).and_return(@stdout)
+        VirtualMachine.stub(:run).and_return(@stdout)
         VirtualMachine.stub(:new).and_return(vm)
         VirtualMachine.all.should eql([vm, vm, vm])
       end
 
       it 'should return an empty list if no virtual machines exist' do
-        VirtualMachine.stub(:command).and_return('')
+        VirtualMachine.stub(:run).and_return('')
         VirtualMachine.all.should eql([])
       end
 
       it 'should instantiate all virtual machines by their uuid' do
-        VirtualMachine.stub(:command).and_return(@stdout)
+        VirtualMachine.stub(:run).and_return(@stdout)
         @uuids.each { |uuid| VirtualMachine.should_receive(:new).with(uuid) }
         VirtualMachine.all
       end
 
       it 'should query a list of all virtual machines via command' do
         cmd = %w{prlctl list --all --output uuid}
-        VirtualMachine.should_receive(:command).with(*cmd).and_return(@stdout)
+        VirtualMachine.should_receive(:run).with(*cmd).and_return(@stdout)
         VirtualMachine.stub(:new)
         VirtualMachine.all
       end
@@ -67,7 +67,7 @@ module PrlBackup
     %w[start stop].each do |cmd|
       describe "##{cmd}" do
         it "should #{cmd} the virtual machine" do
-          @vm.should_receive(:command!).with('prlctl', cmd, @uuid).and_return('')
+          @vm.should_receive(:conditionally_run).with('prlctl', cmd, @uuid).and_return('')
           @vm.send(cmd)
         end
       end
@@ -76,30 +76,30 @@ module PrlBackup
     describe '#backup' do
       it 'should create an incremental backup by default' do
         @vm.stub(:config).and_return({})
-        @vm.should_receive(:command!).with('prlctl', 'backup', @uuid)
+        @vm.should_receive(:conditionally_run).with('prlctl', 'backup', @uuid)
         @vm.instance_eval { backup }
       end
 
       it 'should create a full backup when configured' do
         @vm.stub(:config).and_return({:full => true})
-        @vm.should_receive(:command!).with('prlctl', 'backup', @uuid, '--full')
+        @vm.should_receive(:conditionally_run).with('prlctl', 'backup', @uuid, '--full')
         @vm.instance_eval { backup }
       end
     end
 
-    describe '#safe_backup' do
+    describe '#safely_backup' do
       it 'should stop the VM during the backup' do
         @vm.stub(:stopped?).and_return(false)
         @vm.should_receive(:stop).ordered
         @vm.should_receive(:backup).ordered
         @vm.should_receive(:start).ordered
-        @vm.safe_backup
+        @vm.safely_backup
       end
 
       it 'should not stop the VM when already shutdown' do
         @vm.stub(:stopped?).and_return(true)
         @vm.should_receive(:backup)
-        @vm.safe_backup
+        @vm.safely_backup
       end
     end
 
@@ -133,7 +133,7 @@ module PrlBackup
 
     describe '#delete_backup' do
       it 'should delete the virtual machines backup' do
-        @vm.should_receive(:command!).with('prlctl', 'backup-delete', '--tag', '{some-backup-uuid}')
+        @vm.should_receive(:conditionally_run).with('prlctl', 'backup-delete', '--tag', '{some-backup-uuid}')
         @vm.instance_eval { delete_backup('{some-backup-uuid}') }
       end
     end
@@ -148,11 +148,11 @@ ID Backup_ID                              Node                 Date
 {deadbeef} {2aeb4ada-6623-4087-9fc5-f09aeaafd81e} psfm.example.com 03/23/2012 21:25:50     f 47315014888
 {deadbeef} {68f7e154-6755-46f6-ad1f-a79c5f488f35} psfm.example.com 03/28/2012 15:09:05     f 23462808438
 {deadbeef} {68f7e154-6755-46f6-ad1f-a79c5f488f35}.2 psfm.example.com 04/05/2012 17:21:12     i 12841952117'
-        @vm.stub(:command).and_return(stdout)
+        @vm.stub(:run).and_return(stdout)
       end
 
       it 'should query the backup list by CLI' do
-        @vm.should_receive(:command).with('prlctl', 'backup-list', @uuid)
+        @vm.should_receive(:run).with('prlctl', 'backup-list', @uuid)
         @vm.instance_eval { full_backups }
       end
 
@@ -194,12 +194,12 @@ ID Backup_ID                              Node                 Date
 
     describe '#update_info' do
       it 'should query infos about the virtual machine' do
-        @vm.should_receive(:command).with('prlctl', 'list', '--info', 'foo')
+        @vm.should_receive(:run).with('prlctl', 'list', '--info', 'foo')
         @vm.instance_eval { update_info }
       end
 
       it 'should update and return the infos' do
-        @vm.stub(:command).and_return('Foo: Bar', 'Foo: Baz')
+        @vm.stub(:run).and_return('Foo: Bar', 'Foo: Baz')
         @vm.instance_eval { update_info }.should eql('Foo: Bar')
         @vm.instance_eval { info }.should eql('Foo: Bar')
         @vm.instance_eval { update_info }.should eql('Foo: Baz')

data/spec/prlbackup_spec.rb

@@ -5,10 +5,10 @@ module PrlBackup
     include PrlBackup
   end
 
-  describe '#command!' do
+  describe '#conditionally_run' do
     before do
       @foo = Foo.new
-      @foo.stub(:command).and_return('')
+      @foo.stub(:run).and_return('')
       @foo.stub_chain(:logger, :info)
     end
 
@@ -18,19 +18,19 @@ module PrlBackup
       end
 
       it 'should run the command' do
-        @foo.should_receive(:command).with('hello', 'world')
-        @foo.command!('hello', 'world')
+        @foo.should_receive(:run).with('hello', 'world')
+        @foo.conditionally_run('hello', 'world')
       end
 
       it 'should return stdout from command' do
-        @foo.stub(:command).and_return("hello\nworld")
-        @foo.command!.should eql("hello\nworld")
+        @foo.stub(:run).and_return("hello\nworld")
+        @foo.conditionally_run.should eql("hello\nworld")
       end
 
       it 'should log the last stdout line' do
-        @foo.stub(:command).and_return("first line\nlast line")
+        @foo.stub(:run).and_return("first line\nlast line")
         @foo.logger.should_receive(:info).with('last line')
-        @foo.command!
+        @foo.conditionally_run
       end
     end
 
@@ -40,17 +40,17 @@ module PrlBackup
       end
 
       it 'should not run the command' do
-        @foo.should_not_receive(:command)
-        @foo.command!
+        @foo.should_not_receive(:run)
+        @foo.conditionally_run
       end
 
       it 'should return a blank string' do
-        @foo.command!.should eql('')
+        @foo.conditionally_run.should eql('')
       end
 
       it 'should log the command which would be performed' do
         @foo.logger.should_receive(:info).with('Dry-running `some command`...')
-        @foo.command!('some', 'command')
+        @foo.conditionally_run('some', 'command')
       end
     end
   end
@@ -82,7 +82,7 @@ module PrlBackup
     end
   end
 
-  describe '#command' do
+  describe '#run' do
     context 'with option --verbose' do
       before do
         @foo = Foo.new
@@ -94,7 +94,7 @@ module PrlBackup
 
       it 'should log which command would be running' do
         @foo.logger.should_receive(:info).with('Running `some command`...')
-        @foo.command('some', 'command')
+        @foo.run('some', 'command')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prlbackup
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70187429036680 !ruby/object:Gem::Requirement
+  requirement: &70294085963400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187429036680
+  version_requirements: *70294085963400
 - !ruby/object:Gem::Dependency
   name: gem-man
-  requirement: &70187429034300 !ruby/object:Gem::Requirement
+  requirement: &70294085961160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70187429034300
+  version_requirements: *70294085961160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70187429032680 !ruby/object:Gem::Requirement
+  requirement: &70294085959680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70187429032680
+  version_requirements: *70294085959680
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70187429031540 !ruby/object:Gem::Requirement
+  requirement: &70294085958680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *70187429031540
+  version_requirements: *70294085958680
 - !ruby/object:Gem::Dependency
   name: aruba-doubles
-  requirement: &70187429030720 !ruby/object:Gem::Requirement
+  requirement: &70294085949480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70187429030720
+  version_requirements: *70294085949480
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70187429029460 !ruby/object:Gem::Requirement
+  requirement: &70294085948560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70187429029460
+  version_requirements: *70294085948560
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70187429028520 !ruby/object:Gem::Requirement
+  requirement: &70294085947860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *70187429028520
+  version_requirements: *70294085947860
 - !ruby/object:Gem::Dependency
   name: guard-ronn
-  requirement: &70187429027660 !ruby/object:Gem::Requirement
+  requirement: &70294085947080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *70187429027660
+  version_requirements: *70294085947080
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &70187429026680 !ruby/object:Gem::Requirement
+  requirement: &70294085946220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70187429026680
+  version_requirements: *70294085946220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70187429025980 !ruby/object:Gem::Requirement
+  requirement: &70294085945520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187429025980
+  version_requirements: *70294085945520
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70187429024760 !ruby/object:Gem::Requirement
+  requirement: &70294085944620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70187429024760
+  version_requirements: *70294085944620
 description: an awesome backup tool for Parallels Server Virtual Machines
 email:
 - bjoernalbers@googlemail.com
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1982338634327225623
+      hash: -2854160229902892103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,13 +187,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1982338634327225623
+      hash: -2854160229902892103
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: prlbackup-1.1.1
+summary: prlbackup-1.1.2
 test_files:
 - features/cleanup.feature
 - features/create_backups.feature