vagrant-snap 0.09 → 0.10

data/CHANGELOG

@@ -1,3 +1,7 @@
+* 0.10
+2012-01-26
+   * rewite to support vagrant 0.9(it no longer use Thor).
+   * dirty hack but work..
 * 0.09
 2011-07-19
    * don't die on VM defined in env but not yet created, thanks to Ches Martin

data/README.md

@@ -1,7 +1,7 @@
 What's this?
 ==================================
 vagrant snapshot management plugin
-can handle multi-vm envirnment.
+can handle multi-vm environment.
 
 ## Install
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'echoe'
 Echoe.new "vagrant-snap", File.read("./VERSION").chomp do |p|
   p.author = "t9md"
   p.email = "taqumd@gmail.com"
-  p.summary = %Q{vagrant snapshot managemen plugin}
+  p.summary = %Q{vagrant snapshot management plugin}
   p.project = nil
   p.url = "http://github.com/t9md/vagrant-snap"
   p.ignore_pattern = ["misc/*"]

data/VERSION

@@ -1 +1 @@
-0.09
+0.10

data/lib/vagrant_snap.rb

@@ -1,4 +1,6 @@
+require "virtualbox"
 require "colored"
+require "pp"
 
 module Snap
   module VBox
@@ -17,7 +19,7 @@ module Snap
 
         def parse_tree(vmname)
           init
-          vm = VirtualBox::VM.find( vmname )
+          vm = ::VirtualBox::VM.find( vmname )
           @@current = vm.current_snapshot
           return unless @@current
           @@tree = _parse(vm.root_snapshot)
@@ -68,6 +70,16 @@ module Snap
           end
         end
 
+        def next_available_snapname
+          if lastname.nil?
+            "0"
+          else
+            n = lastname.succ
+            n = n.succ while VBox::SnapShot.include? n
+            n
+          end
+        end
+
         def include?(name)
           return false unless tree
           tree.flatten.map(&:name).include? name
@@ -91,110 +103,156 @@ module Snap
     end #}}}
   end
 
-  class Command < Vagrant::Command::GroupBase
-    register "snap","Manages a snap"
+  class Snap < Vagrant::Command::Base
+    def help
+      puts <<-EOS
+Usage: vagrant snap <subcommand> [options...]
 
-    no_tasks {
-      def env
-        @_env ||= Vagrant::Environment.new
+ subcommands are..
+    vagrant snap list
+    vagrant snap back
+    vagrant snap go <snapshot> [boxname]
+    vagrant snap take [TARGET] [-n SNAP_NAME] [-d DESC]"
+    vagrant snap delete <snapshot> [boxname]"
+    
+      EOS
+    end
+    def execute# {{{
+      @main_args, @sub_command, @sub_args = split_main_and_subcommand(@argv)
+      # p [@main_args, @sub_command, @sub_args]
+
+      # sub_list = %w(list go back take delete test)
+      sub_list = %w(list go back take delete)
+      unless @sub_command
+        help
+        exit
+      end
+      if sub_list.include? @sub_command
+        send(@sub_command)
+      else
+        ui.warn "unkown command '#{@sub_command}'"
+        help
+        exit
       end
+    end# }}}
 
-      def with_target(target, &blk)
-        target_found = false
-        env.vms.each do |name, vm|
-          next if vm.vm.nil?    # not yet created
-          vagvmname = vm.name
-          vmname    = vm.vm.name
+    private
+    # def env
+    # @_env ||= Vagrant::Environment.new
+    # end
 
-          if target.nil? or target.to_sym == vagvmname
-            blk.call(vmname, vagvmname)
-            target_found = true
-          end
-        end
-        warn "A VM by the name of `#{target}' was not found".red unless target_found
-      end
-    }
-
-    desc "list", "list snapshot"
-    def list(target=nil)
-      with_target(target) do |vmname, vagvmname|
-        puts "[#{vagvmname}]"
-        VBox::SnapShot.parse_tree( vmname )
-        if VBox::SnapShot.tree
-          result = VBox::SnapShot.show
-        else
-          result = "no snapshot"
+    def ui# {{{
+      @ui ||= ::Vagrant::UI::Colored.new("vagrant")
+    end# }}}
+    def safe_with_target_vms(target, &blk)# {{{
+      with_target_vms(target) do |vm|
+        unless vm.created?
+          @logger.info("not created yet: #{vm.name}")
+          next
         end
-        puts result
+        puts "[#{vm.name}]"
+        blk.call(vm)
       end
-    end
+    end# }}}
+    def target_vmname# {{{
+      target = @sub_args.empty? ? nil : @sub_args.last.to_s
+    end# }}}
+    def exe(cmd)# {{{
+      puts "# exe: #{cmd}" if @exe_verbose
+      system cmd
+    end# }}}
 
-    desc "go SNAP_NAME", "go to specified snapshot"
-    def go(snapshot_name, target=nil)
-      with_target(target) do |vmname, vagvmname|
-        puts "[#{vagvmname}]"
-        VBox::SnapShot.parse_tree( vmname )
-        if VBox::SnapShot.include?( snapshot_name )
-          system "VBoxManage controlvm #{vmname} poweroff"
-          system "VBoxManage snapshot  #{vmname} restore #{snapshot_name}"
-          system "VBoxManage startvm   #{vmname} --type headless"
+    def list# {{{
+      # options = {}
+      # opts = OptionParser.new { |opts| opts.banner = "vagrant snap list" }
+      # argv = parse_options(opts)
+      # # p argv
+      safe_with_target_vms(target_vmname) do |vm|
+        VBox::SnapShot.parse_tree( vm.uuid )
+        puts VBox::SnapShot.tree ? VBox::SnapShot.show : "no snapshot"
+      end
+    end# }}}
+    def go # {{{
+      options = {}
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: vagrant snapt go <snapshot> [boxname]"
+      end
+      snapshot, target = *@sub_args
+      unless snapshot
+        puts opts.help
+        return
+      end
+      safe_with_target_vms(target) do |vm|
+        VBox::SnapShot.parse_tree( vm.uuid )
+        if VBox::SnapShot.include?( snapshot )
+          exe "VBoxManage controlvm '#{vm.uuid}' poweroff"
+          exe "VBoxManage snapshot  '#{vm.uuid}' restore '#{snapshot}'"
+          exe "VBoxManage startvm   '#{vm.uuid}' --type headless"
         else
-          warn "#{snapshot_name} is not exist".red
+          ui.warn "'#{snapshot}' is not exist"
         end
       end
-    end
-
-    desc "back", "back to current snapshot"
-    def back(target=nil)
-      with_target(target) do |vmname, vagvmname|
-        puts "[#{vagvmname}]"
-        system "VBoxManage controlvm #{vmname} poweroff"
-        system "VBoxManage snapshot  #{vmname} restorecurrent"
-        system "VBoxManage startvm   #{vmname} --type headless"
+    end# }}}
+    def back# {{{
+      safe_with_target_vms(target_vmname) do |vm|
+        exe "VBoxManage controlvm '#{vm.uuid}' poweroff"
+        exe "VBoxManage snapshot  '#{vm.uuid}' restorecurrent"
+        exe "VBoxManage startvm   '#{vm.uuid}' --type headless"
+      end
+    end# }}}
+    def take# {{{
+      options = {}
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: vagrant snap take [TARGET] [-n SNAP_NAME] [-d DESC]"
+        opts.on("-n", "--name STR", "Name of snapshot"       ){ |v| options[:name] = v }
+        opts.on("-d", "--desc STR", "Description of snapshot"){ |v| options[:desc] = v }
       end
-    end
 
-    desc "take [TARGET] [-n SNAP_NAME] [-d DESC]", "take snapshot"
-    method_option :desc, :type => :string, :aliases => "-d"
-    method_option :name, :type => :string, :aliases => "-n"
-    def take(target=nil)
-      with_target(target) do |vmname, vagvmname|
-        puts "[#{vagvmname}]"
-        VBox::SnapShot.parse_tree( vmname )
-        if options.name
-          if VBox::SnapShot.include? options.name
-            warn "#{options.name} is already exist".red
-            next
-          else
-            new_name = options.name
-          end
+      begin
+        argv =  parse_options(opts)
+      rescue OptionParser::MissingArgument
+        raise ::Vagrant::Errors::CLIInvalidOptions, :help => opts.help.chomp
+      end
+      return if !argv
+      @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+      # p @sub_args
+      # return
+      # snapshot, target = *@sub_args
+      safe_with_target_vms(target_vmname) do |vm|
+        VBox::SnapShot.parse_tree( vm.uuid )
+        if options[:name] and VBox::SnapShot.include? options[:name]
+          ui.warn "'#{options[:name]}' is already exist"
+          next
         end
-        unless new_name
-          lastname = VBox::SnapShot.lastname
-          new_name = if lastname.nil?
-                       "0"
-                     else
-                       n = lastname.succ
-                       n = n.succ while VBox::SnapShot.include? n
-                       n
-                     end
+        snapshot = options[:name] ? options[:name] : VBox::SnapShot.next_available_snapname
+        cmd = "VBoxManage snapshot '#{vm.uuid}' take '#{snapshot}' --pause"
+        if options[:desc]
+          cmd << " --description '#{options[:desc]}'"
         end
-        desc = options.desc ? " --description '#{options.desc}'" : ""
-        system "VBoxManage snapshot '#{vmname}' take '#{new_name}' #{desc} --pause"
+        exe cmd
       end
-    end
+    end# }}}
 
-    desc "delete SNAP_NAME", "delete snapshot"
-    def delete(snapshot_name, target=nil)
-      with_target(target) do |vmname, vagvmname|
-        puts "[#{vagvmname}]"
-        VBox::SnapShot.parse_tree( vmname )
-        if VBox::SnapShot.include?( snapshot_name )
-          system "VBoxManage snapshot #{vmname} delete #{snapshot_name}"
+    def delete# {{{
+      options = {}
+      opts = OptionParser.new do |opts|
+        opts.banner = "vagrant snap delete <snapshot> [boxname]"
+      end
+      snapshot, target = *@sub_args
+      unless snapshot
+        puts opts.help
+        return
+      end
+      snapshot, target = *@sub_args
+      safe_with_target_vms(target) do |vm|
+        VBox::SnapShot.parse_tree( vm.uuid )
+        if VBox::SnapShot.include?( snapshot )
+          exe "VBoxManage snapshot '#{vm.uuid}' delete '#{snapshot}'"
         else
-          warn "#{snapshot_name} is not exist".red
+          ui.warn "'#{snapshot}' is not exist"
         end
       end
-    end
+    end# }}}
   end
 end
+Vagrant.commands.register(:snap) { ::Snap::Snap }

data/vagrant-snap.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant-snap}
-  s.version = "0.09"
+  s.version = "0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["t9md"]
-  s.date = %q{2011-07-19}
-  s.description = %q{vagrant snapshot managemen plugin}
+  s.date = %q{2012-01-26}
+  s.description = %q{vagrant snapshot management plugin}
   s.email = %q{taqumd@gmail.com}
   s.extra_rdoc_files = ["LICENSE.txt", "README.md", "CHANGELOG", "lib/vagrant_init.rb", "lib/vagrant_snap.rb"]
   s.files = ["LICENSE.txt", "Manifest", "README.md", "Rakefile", "VERSION", "CHANGELOG", "lib/vagrant_init.rb", "lib/vagrant_snap.rb", "vagrant-snap.gemspec"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Vagrant-snap", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{vagrant snapshot managemen plugin}
+  s.summary = %q{vagrant snapshot management plugin}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-snap
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 9
-  version: "0.09"
+  - 10
+  version: "0.10"
 platform: ruby
 authors: 
 - t9md
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +09:00
+date: 2012-01-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: vagrant snapshot managemen plugin
+description: vagrant snapshot management plugin
 email: taqumd@gmail.com
 executables: []
 
@@ -106,6 +106,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: vagrant snapshot managemen plugin
+summary: vagrant snapshot management plugin
 test_files: []