vagrant-snap 0.04 → 0.06

data/VERSION

@@ -1 +1 @@
-0.04
+0.06

data/lib/vagrant_snap.rb

@@ -3,18 +3,24 @@ require "colored"
 module Snap
   module VBox
     class SnapShot #{{{
-      @@snaps = []
       class << self
-        def is_endnode?() @@current.uuid == @@snaps.last.uuid end
-
-        def snaps() @@snaps end 
+        def tree
+          @@tree
+        end
+        
+        Snap = Struct.new(:name, :time_stamp, :description, :uuid, :current)
+        
+        def init
+          @@current = nil
+          @@tree = nil
+        end
 
         def parse_tree(vmname)
+          init
           vm = VirtualBox::VM.find( vmname )
           @@current = vm.current_snapshot
-          @@indent = ""
           return unless @@current
-          _parse(vm.root_snapshot)
+          @@tree = _parse(vm.root_snapshot)
         end
 
         # [TODO] need refactoring
@@ -37,30 +43,53 @@ module Snap
           end
         end
 
-        ## [TODO] darty hack, should be written more simply
-        def _parse(snaps, guide = "")
-          @@snaps << snaps.name
-          time = time_elapse(Time.now - snaps.time_stamp)
-          snapinfo = "#{snaps.name} [ #{time} ]"
-          snapinfo = snapinfo.yellow  if snaps.uuid == @@current.uuid
-          result = "#{guide} #{snapinfo}"
-          result << " #{snaps.description}" unless snaps.description.empty?
-          result << "\n"
-          snaps.children.each_with_index do |e, idx|
-            tmp = guide.sub("`", " ").chop.chop + "   "
-            nextguide = if snaps.children.size == idx + 1
-                          "`"
-                        else
-                          "|"
-                        end
-            tmp << nextguide << "--"
-            result <<  _parse(e, "#{tmp}")
+        def _parse(s)
+          tree = [ Snap.new(s.name , s.time_stamp, s.description, s.uuid, s.uuid == @@current.uuid) ]
+          s.children.each do |c|
+            tree.concat [_parse(c)]
+          end
+          tree
+        end
+
+        def format(guide, s)
+          time     = time_elapse(Time.now - s.time_stamp)
+          snapinfo = "#{s.name} [ #{time} ]"
+          snapinfo  = snapinfo.yellow  if s.current
+          result   = "#{guide} #{snapinfo}"
+          result  << " #{s.description}" unless s.description.empty?
+          result  << "\n"
+        end
+
+        def lastname
+          if tree
+            tree.flatten.sort_by(&:time_stamp).last.name
+          else
+            nil
+          end
+        end
+
+        def include?(name)
+          tree.flatten.map(&:name).include? name
+        end
+
+        def show(t=tree, guide="")
+          result = ""
+          t.each_with_index do |v, idx|
+            case v
+            when Array
+              tmp = guide.dup.chop.chop.sub("`", " ") << "    "
+              tmp << "#{t.size == idx + 1 ? '`' : '|'}" << "--"
+              result << show(v, tmp)
+            else
+              result << format(guide, v)
+            end
           end
           result
         end
       end
     end #}}}
   end
+
 	class Command < Vagrant::Command::GroupBase
 	  register "snap","Manages a snap"
 
@@ -73,16 +102,14 @@ module Snap
         target_found = false
         env.vms.each do |name, vm|
           vagvmname = vm.name
-          vmname = vm.vm.name
-          if target
-            blk.call(vmname, vagvmname) if target.to_sym == vagvmname
-            target_found = true
-          else
+          vmname    = vm.vm.name
+
+          if target.nil? or target.to_sym == vagvmname
             blk.call(vmname, vagvmname)
             target_found = true
           end
         end
-        warn "you need to select collect vmname" unless target_found
+        warn "A VM by the name of `#{target}' was not found".red unless target_found
       end
     }
 
@@ -90,8 +117,13 @@ module Snap
 	  def list(target=nil)
       with_target(target) do |vmname, vagvmname|
         puts "[#{vagvmname}]"
-        result = VBox::SnapShot.parse_tree( vmname )
-        puts result ? result : "no snapshot"
+        VBox::SnapShot.parse_tree( vmname )
+        if VBox::SnapShot.tree
+          result = VBox::SnapShot.show
+        else
+          result = "no snapshot"
+        end
+        puts result
       end
 	  end
 
@@ -99,9 +131,14 @@ module Snap
 	  def go(snapshot_name, target=nil)
       with_target(target) do |vmname, vagvmname|
         puts "[#{vagvmname}]"
-        system "VBoxManage controlvm #{vmname} poweroff"
-        system "VBoxManage snapshot  #{vmname} restore #{snapshot_name}"
-        system "VBoxManage startvm   #{vmname} --type headless"
+        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"
+        else
+          warn "#{snapshot_name} is not exist".red
+        end
       end
 	  end
 
@@ -115,14 +152,31 @@ module Snap
       end
 	  end
 
-	  desc "take [NAME] [-d DESC]", "take snapshot"
+	  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 )
-        last_name = VBox::SnapShot.snaps.sort.reverse.first
-        new_name = last_name.nil? ? "#{vagvmname}-01" : last_name.succ
+        if options.name
+          if VBox::SnapShot.include? options.name
+            warn "#{options.name} is already exist".red
+            next
+          else
+            new_name = options.name
+          end
+        end
+        unless new_name
+          lastname = VBox::SnapShot.lastname
+          new_name = if lastname.nil?
+                       "001"
+                     else
+                       n = lastname.succ
+                       n = n.succ while VBox::SnapShot.include? n
+                       n
+                     end
+        end
         desc = options.desc ? " --description '#{options.desc}'" : ""
         system "VBoxManage snapshot #{vmname} take #{new_name} #{desc} --pause"
       end
@@ -132,7 +186,12 @@ module Snap
 	  def delete(snapshot_name, target=nil)
       with_target(target) do |vmname, vagvmname|
         puts "[#{vagvmname}]"
-        system "VBoxManage snapshot #{vmname} delete #{snapshot_name}"
+        VBox::SnapShot.parse_tree( vmname )
+        if VBox::SnapShot.include?( snapshot_name )
+          system "VBoxManage snapshot #{vmname} delete #{snapshot_name}"
+        else
+          warn "#{snapshot_name} is not exist".red
+        end
       end
 	  end
 	end

data/vagrant-snap.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant-snap}
-  s.version = "0.04"
+  s.version = "0.06"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["t9md"]
-  s.date = %q{2011-06-06}
+  s.date = %q{2011-06-08}
   s.description = %q{vagrant snapshot managemen plugin}
   s.email = %q{taqumd@gmail.com}
   s.extra_rdoc_files = ["LICENSE.txt", "README.md", "lib/vagrant_init.rb", "lib/vagrant_snap.rb"]

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-snap
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.04"
+  - 6
+  version: "0.06"
 platform: ruby
 authors: 
 - t9md
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +09:00
+date: 2011-06-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency