catalog 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe2e0974fc3a6ebd971be5c8c6840deaddbf31b
-  data.tar.gz: e60c2f1e768b51932ab231d34677a6bd847509fb
+  metadata.gz: 5c141dfe2ef4460a9a78967dc0a9b8efad223d97
+  data.tar.gz: 34dd630c49882b358e7653fc4529fa5a1512f7c1
 SHA512:
-  metadata.gz: dde4a5fa55fb32c80911bbbd2d3fed24c6836e1944a9fb6037770d0a60a4ea6d268a64fb136c9d2856f88435361e1901a22cb37f88a44beb4cb8b2909e42cd77
-  data.tar.gz: ad3d8eb200633a8b296c10eaabf71faeab7cadb4985f95e7f8867b162fe4bd058f31ac6e8979babbe45dfaf8d1cbff975db6d67848936e2acb6c64057b2d1b7e
+  metadata.gz: c59b050ceeac37790a6d6e0e43441e48e27f66721c6914f01a5c70808583dd1dc9f0f7c1a067e051cc07c9c37a85ab5cbc16e650770c953a90268ec7407b0d01
+  data.tar.gz: 6a1d4694cc3890779d40a714e31c1d9817fe1261b0d72e0563e9824057adabe7f9645b934f29c690bf10f9d143697b322071790eb7a1b944c0df0f8e203b096a

data/README.md

@@ -1,11 +1,11 @@
 # Catalog
-*Catalog prevents your download folder from being a mess on Mac Os X.*
+*Catalog prevents your download folder from being a mess on your Mac.*
 
 ## The problem
 
-The *Downloads* folder on a Mac is the most clusttered folder there is. Even with the best intentions, we end up not cleaning it as often as we should.
+The *Downloads* folder on a Mac is the most cluttered folder there is. Even with the best intentions, we end up not cleaning it as often as we should.
 
-*Catalog* allow us to create rules to automatically organize your downloads based on its origin (*i.e. http://someurl.com/path/to/file.pdf*).
+*Catalog* allow us to create rules to automatically organize your downloads based on their origin (*i.e. http://someurl.com/path/to/file.pdf*).
 
 ## Installation
 
@@ -19,7 +19,7 @@ $ touch ~/.catalog
 
 ## State of project
 
-The current version **doesn't include a CLI**. You'll have to use it through IRB as you can see in the [How to use](#how-to-use) section. The next step will be to provide a CLI using guard and a way to easily deamonize this.
+The current version **doesn't include a CLI**. You'll have to use it through IRB as you can see in the [How to use](#how-to-use) section. The next step will be to provide a CLI and a way to easily deamonize this.
 
 ## How to use
 

data/bin/catalog

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w(.. lib))
+
+require 'catalog'
+
+Catalog::CLI.new(ARGV).run

data/catalog.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/catalog.rb

@@ -1,10 +1,14 @@
 require 'yaml'
 require 'shellwords'
+require 'optparse'
 
 # Core
 require 'catalog/organizer'
 require 'catalog/config'
 
+# CLI
+require 'catalog/cli'
+
 # Models
 require 'catalog/models/document'
 require 'catalog/models/drawer'

data/lib/catalog/cli.rb

@@ -0,0 +1,23 @@
+module Catalog
+  class CLI
+    def initialize(args)
+      @args = args
+      @options = {}
+
+      parser = OptionParser.new do |opts|
+        opts.on('-p', '--path PATH', 'Path of the folder to clean') { |path| @options[:path] = path }
+        opts.on('-c', '--config PATH', 'Path of your .catalog file') { |path| @options[:config] = path }
+      end
+
+      parser.parse!(args)
+    end
+
+    def run
+      # Override .catalog.yml file location
+      Catalog::Config.config_path(@options[:config]) if @options[:config]
+
+      # Run to organizer
+      Catalog::Organizer.new(base_path: @options[:path]).run!
+    end
+  end
+end

data/lib/catalog/config.rb

@@ -4,11 +4,21 @@ module Catalog
       config['drawers']
     end
 
+    def self.config_path(path = nil)
+      if path
+        @config_path
+      else
+        @config_path = path
+      end
+
+      File.expand_path(@config_path || '~/.catalog.yml')
+    end
+
   private
 
     def self.config
       unless @config
-        raw_content = File.read(File.expand_path('~/.catalog.yml'))
+        raw_content = File.read(config_path)
         @config = YAML.load(raw_content)
       end
 

data/lib/catalog/organizer.rb

@@ -1,7 +1,7 @@
 module Catalog
   class Organizer
     def initialize(base_path: nil)
-      @base_path = base_path || '~/Downloads/*'
+      @base_path = base_path ? "#{base_path}/*" : '~/Downloads/*'
     end
 
     def run!

data/lib/catalog/services/document_mover.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Catalog
   class DocumentMover
     def initialize(document:, drawer:)

data/lib/catalog/services/drawer_matcher.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Catalog
   class DrawerMatcher
     # Accessors

data/lib/catalog/version.rb

@@ -1,3 +1,3 @@
 module Catalog
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catalog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Garneau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,8 @@ dependencies:
 description: Catalog prevents your download folder from being a mess on Mac Os X.
 email:
 - sam@garno.me
-executables: []
+executables:
+- catalog
 extensions: []
 extra_rdoc_files: []
 files:
@@ -64,8 +65,10 @@ files:
 - Gemfile.lock
 - LICENSE.md
 - README.md
+- bin/catalog
 - catalog.gemspec
 - lib/catalog.rb
+- lib/catalog/cli.rb
 - lib/catalog/config.rb
 - lib/catalog/errors/configuration_missing.rb
 - lib/catalog/models/document.rb