attic-cleanup 0.0.4 → 0.0.5

data/README.md

@@ -81,6 +81,15 @@ Type y to continue or type n to exit.
 Once you press y all the file will be moved to the MyAttic folder and every file will be printed in the log.txt file.
 
 
+Last Example: I want to send certain files in a folder to a different folder, but not the MyAttic folder
+========================================================================================================
+attic-cleanup store @doc @projects
+
+
+This line will give you the option to send files / folders from @doc to @projects.
+
+This works exactly the same way as storing files to the MyAttic folder, except you're storing your files to a different location
+
 Checking which shortcuts are available
 ======================================
 attic-cleanup shortcuts

data/lib/attic-cleanup.rb

@@ -22,15 +22,17 @@ require File.expand_path("../../lib/attic-cleanup/initialize/init", __FILE__)
 # All the constants and initializers
 module MyAttic
   ATTIC     = File.join(ENV["HOME"], "MyAttic")
-  TODAY     = File.join(ENV["HOME"], "MyAttic", Date.today.to_s)
-  CUSTOM    = File.join(ENV["HOME"], "MyAttic/custom_paths.txt")
-  DEFAULT   = File.join(ENV["HOME"], "MyAttic/default_path.txt")
-  IGNORE    = File.join(ENV["HOME"], "MyAttic/ignore_files.txt")
-  LOG       = File.join(ENV["HOME"], "MyAttic/log.txt")
+  TODAY     = File.join(MyAttic::ATTIC, Date.today.to_s)
+  CONFIG    = File.join(MyAttic::ATTIC, "config")
+  CUSTOM    = File.join(MyAttic::CONFIG, "custom_paths.txt")
+  DEFAULT   = File.join(MyAttic::CONFIG, "default_path.txt")
+  IGNORE    = File.join(MyAttic::CONFIG, "ignore_files.txt")
+  LOG       = File.join(MyAttic::CONFIG, "log.txt")
   
   # Checks if all the folders and files exist, also deletes any empty folders
   AtticCleanup::Init.check_folder(MyAttic::ATTIC)
   AtticCleanup::Init.check_folder(MyAttic::TODAY)
+  AtticCleanup::Init.check_folder(MyAttic::CONFIG)
   AtticCleanup::Init.check_file(MyAttic::DEFAULT)
   AtticCleanup::Init.check_file(MyAttic::CUSTOM)
   AtticCleanup::Init.check_file(MyAttic::IGNORE)
@@ -39,4 +41,4 @@ module MyAttic
   # This constant is set after the initializers because it reads
   # the custom_paths.txt file. And it needs to be created first.
   SHORTCUTS = AtticCleanup::Path::Custom.all(MyAttic::CUSTOM)
-end
+end

data/lib/attic-cleanup/initialize/init.rb

@@ -5,11 +5,13 @@ module AtticCleanup
     CUSTOM_FILE   = "#Write all your custom paths here.
 #Or generate them with the 'attic-cleanup new' command
 #Write all your custom paths like the examples, no extra spaces.
+des #{File.join(ENV['HOME'], 'Desktop')}
 doc #{File.join(ENV['HOME'], 'Documents')}
 pic #{File.join(ENV['HOME'], 'Pictures')}
 mus #{File.join(ENV['HOME'], 'Music')}
 mov #{File.join(ENV['HOME'], 'Movies')}
-dow #{File.join(ENV['HOME'], 'Downloads')}"
+dow #{File.join(ENV['HOME'], 'Downloads')}
+dro #{File.join(ENV['HOME'], 'Dropbox')}"
 
     # Default text for the default_path.txt file
     DEFAULT_FILE  = "#Write your default location here.
@@ -24,8 +26,7 @@ dow #{File.join(ENV['HOME'], 'Downloads')}"
 #{File.join(ENV['HOME'], 'Music')}
 #{File.join(ENV['HOME'], 'Movies')}
 #{File.join(ENV['HOME'], 'Downloads')}
-#{File.join(ENV['HOME'], 'Dropbox')}
-#{File.join(ENV['HOME'], 'MyAttic')}"
+#{File.join(ENV['HOME'], 'Dropbox')}\n#{File.join(ENV['HOME'], 'MyAttic')}"
 
     # Checks if folder exists, if it doesn't it will be created
     def self.check_folder(value)
@@ -56,11 +57,11 @@ dow #{File.join(ENV['HOME'], 'Downloads')}"
     def self.clear
       attic_folders = Dir.glob(File.join(MyAttic::ATTIC, "*"));
       attic_folders.each do |f|
-        if f == MyAttic::CUSTOM || f == MyAttic::LOG || f == MyAttic::TODAY || f == MyAttic::DEFAULT || f == MyAttic::IGNORE
+        if f == MyAttic::TODAY
         elsif Dir[File.join(f, "/*")].empty?
           FileUtils.rm_rf(f)
         end
       end
-    end
+    end  
   end
 end

data/lib/attic-cleanup/path/custom.rb

@@ -15,6 +15,17 @@ module AtticCleanup
         end
       end
       
+      def check_shortcut(input)
+        if input[0..0] == "@"
+          c = AtticCleanup::Path::Custom.new
+          # The input without the first character (the @ sign)
+          c.name = input[1..-1]
+          c.file = MyAttic::CUSTOM
+          input = c.find_custom
+        end
+        input
+      end
+      
       # Selects every line from the selected file
       # but ignores lines where the first character is '#'
       def self.all(file)
@@ -66,7 +77,7 @@ module AtticCleanup
             end
           end
           if selected_line == nil
-            puts "Shortcut not found"
+            puts "Shortcut not found '@#{@name}'"
             exit 1
           else
             the_name_count = the_name.count("A-z, \s")

data/lib/attic-cleanup/storage/store_files.rb

@@ -3,6 +3,8 @@ module AtticCleanup
   module Storage
     class StoreFiles
       
+      attr_accessor :destination
+            
       # Easy method for input
       def input
         STDOUT.flush
@@ -17,7 +19,7 @@ module AtticCleanup
       # If the location wasn't set, the default
       # location will be used from the default_path.txt file
       def location= ( value )
-        if value == ""
+        if value == "" || value == nil
           value = AtticCleanup::Path::Custom.default
         elsif value == "."
           Dir.chdir(".")
@@ -26,11 +28,15 @@ module AtticCleanup
         end
         @location = value
       end
-
+      
       # Checks if the selected path exists
       def check
-        if !File.directory? @location
-          puts "Invalid path "  + @location
+        @check
+      end
+      
+      def check=(value)
+        if !File.directory? value
+          puts "Invalid path "  + value
           exit 1
         end
       end
@@ -69,7 +75,8 @@ module AtticCleanup
           i = 1
           while i == 1
             # Message with the current location and simple instructions
-            puts "\n"+location
+            puts "\nFrom: #{location}"
+            puts "To:   #{destination}"
             puts "Which files do you want to store in your attic?"
             puts "Type ls for the list of items"
             puts "Select the items by id. Example: 1,3,5"
@@ -133,12 +140,12 @@ module AtticCleanup
           else
             # If file was found move it, print it and record it in the log
             puts "Moving " + selected_file + " to your attic.."
-            AtticCleanup::Log.save(selected_file, MyAttic::TODAY)
-            FileUtils.mv(selected_file, MyAttic::TODAY)
+            AtticCleanup::Log.save(selected_file, @destination)
+            FileUtils.mv(selected_file, @destination)
           end
         end
-        puts "The files have been moved to " + MyAttic::TODAY
+        puts "The files have been moved to " + @destination
       end
     end
   end
-end
+end

data/lib/attic-cleanup/utility.rb

@@ -6,11 +6,14 @@ module AtticCleanup
     "Choose a path or shortcut to store the contents of the given folder.
     custom paths are called by placing an '@' sign in front of it.
     example: @mypath
+    You can also store from one place to another, example:
+    attic-cleanup store @doc @myproject
+    Now you can choose files / folders from the @doc path and send them to the @myproject folder.
     
     -a => 'all'
     -f => 'force'\n\n"
     method_options :a => :boolean, :f => :boolean
-    def store(input="")
+    def store(location="", destination="")
       
       # Checks if the options are set
       if options[:a]
@@ -19,21 +22,24 @@ module AtticCleanup
       if options[:f]
         f = true
       end
-      
-      # If the input for store has an "@" at the beginning
-      # it's a shortcut.
-      if input[0..0] == "@"
-        c = AtticCleanup::Path::Custom.new
-        # The input without the first character (the @ sign)
-        c.name = input[1..-1]
-        c.file = MyAttic::CUSTOM
-        input = c.find_custom
-      end
+
       # The input is the location, if the input had an @ sign
       # at the beginning, the custom path will be stored in input variable
+      c = AtticCleanup::Path::Custom.new
       s = AtticCleanup::Storage::StoreFiles.new
-      s.location = input
-      s.check
+      if destination != nil && destination != ""
+        destination = c.check_shortcut(destination)
+        s.destination = destination
+        s.check = destination
+      else
+        destination = MyAttic::TODAY
+        s.destination = destination
+        s.check = s.destination
+      end
+      location = c.check_shortcut(location)
+      s.location = location
+      location = s.location
+      s.check = location
       s.store(a, f)
     end
 
@@ -56,6 +62,8 @@ module AtticCleanup
     
     desc "default", "Set a default path for store."
     def default(input)
+      c = AtticCleanup::Path::Custom.new
+      input = c.check_shortcut(input)
       AtticCleanup::Path::Custom.set_default(input)
     end
     
@@ -63,6 +71,7 @@ module AtticCleanup
     def ignore(input)
       AtticCleanup::Path::Custom.set_ignore(input)
     end
+    
     desc "shortcuts", "View all available shortcuts"
     # Show all the availible shortcuts from the custom_paths.txt file
     def shortcuts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attic-cleanup
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &74494500 !ruby/object:Gem::Requirement
+  requirement: &70362726577020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74494500
+  version_requirements: *70362726577020
 description: 
 email: kevin.van.rooijen@gmail.com
 executables:
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: attic-cleanup is a gem to easily store your files when you need to get them