lib/smallcage/commands/import.rb in smallcage-0.0.8 vs lib/smallcage/commands/import.rb in smallcage-0.0.9

@@ -4,10 +4,13 @@
       self.new(opts).execute
     end
     
     def initialize(opts)
       @opts = opts
+      if @opts[:from] == "default"
+        @opts[:from] = "base,standard"
+      end
       @project_dir = Pathname.new(__FILE__) + "../../../../project"
     end
     
     def qp(str = "")
       print str unless @opts[:quiet]
@@ -56,22 +59,24 @@
 
     def import_entries
       failed = []
       @entries.each do |e|
         if e.overwrite?
-          qp "*"
+          qps "M /" + e.path
         elsif ! e.exist?
-          qp "+"
+          qps "A /" + e.path
+        elsif e.to.directory?
+          # nothing
         else
-          qp " "
+          qps "? /" + e.path
         end
-        qps " " + e.path
+        
         begin
           e.import
         rescue
           failed << e
-          qps "F " + e.path
+          qps "F /" + e.path
         end
       end
       
       unless failed.empty?
         qps "FAILED:"
@@ -128,18 +133,18 @@
       qps "Create:"
       @entries.each do |e|
         if e.overwrite?
           overwrite << e
         elsif ! e.exist?
-          qps "  " + e.path
+          qps "  /" + e.path
         end
       end
       qps
       
       unless overwrite.empty?
         qps "Overwrite:"
         overwrite.each do |e|
-          qps "  " + e.path
+          qps "  /" + e.path
         end
         qps
       end
       
       return y_or_n("Import these files?[yN]: ", false)
\ No newline at end of file