tagmv 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d10d02448926a0c0f986ad631e4d2f295eb7962
-  data.tar.gz: 323a1d33dd451badf7511b4fee7d6081e228e8c9
+SHA256:
+  metadata.gz: 7bc6f70a29aae56b307b09be9a3108070ed3330934020412932d62bac97a1202
+  data.tar.gz: b082ddb01729079be19620e3be09e80a3f8f1b51fc311c9f7b7f7fd072232666
 SHA512:
-  metadata.gz: b62596a0e6821ae819a67215c1a4c74a43e78d95b55f239c6917a42cbe815fa06d0b108b8000ca9e2001508030be28908ebe32544df5494096cf81561afb3284
-  data.tar.gz: c4821dfdb7491f3951d9729d74055342d9c5bc6b6155543cfa2a8832618f3862a3187c446c2305a14a40ea3b80d3bbe17d432c083a383a8d67d0a9cb39d86d2e
+  metadata.gz: 19567f27d8539032061a6bcd615f4289466c19f991f1c417a56916c4ef27dd1a87ced04c28a575c85ee920c6f57dbc57db56ad51cea15d4566ba827eb8235e5a
+  data.tar.gz: fd6e0bc16ac871938088ceba64b251b8a088ec3781fb74c4a4b73d33844c3b52c49ae3c02321e918c664b497b238c4f30cb4bfeda7b24b0160891c230907a6fb

data/README.md

@@ -2,11 +2,11 @@
 
 The ultimate keep-your-files-organized solution!
 
-Moves your files into directories that represent tags, these tags are kept organized as a hierarchy according to tag counts.
+Moves your files into directories that represent tags, these tags are kept organized as a hierarchy according to usage.
 
 Tag all your files with multiple tags, and watch them end up organized!
 
-Works using the most basic parts of the filesystem - no FUSE, no symbolic or hard links.
+Relies on convention-only, no FUSE, no symbolic links, no hard links.  No special tools required.
 
 ## Installation
 
@@ -18,17 +18,29 @@ Works using the most basic parts of the filesystem - no FUSE, no symbolic or har
 
 This will move your files and directories into:
 
-    ~/t/tag1./tag2./tag3./
+    ~/t/tag1-/tag2-/tag3-/
 
-As you tag more files and folders, it will order the tag directories according to the most popular tags, keeping things organized for you.
+As you tag more files and folders, it will re-order the tag directories by the most commonly used tags, keeping your files automatically organized for you.
 
 ## Current features
 
-Default directory is "~/t/" (not configurable yet, oops)
+Default root directory for all your tagged files is `~/t/` (not configurable yet)
 
-Supports top level tags - so that you can "pin" certain tags to be the top level directory
+## Configuration
 
-Config file: ~/.tagmv.yml   currently supports the top level tags (no easy way to update config yet)
+Configuration file: `~/.tagmv.yml`
+
+Supports top level tags - so that you can "pin" certain tags to always show as the top level directories within `~/t/`
+
+## Commands
+
+`-d, --dry-run` Check to see what gets moved where
+
+`-r, --reorder` **[default]** Move everything in `~/t/` into order of tag usage (example: `tagmv -r`)
+
+`-s, --skip-reorder` Skip reorder (e.g. you are editing tagged files and don't want them moved around yet)
+
+`-t, --tags *tags` Tags for your files or directories, as many as you want
 
 
 ## Upcoming features

data/lib/tagmv.rb

@@ -3,5 +3,7 @@ require 'tagmv/version'
 require 'tagmv/config'
 require 'tagmv/entry'
 require 'tagmv/filesystem'
+require 'tagmv/options'
 require 'tagmv/prune_path'
 require 'tagmv/tree'
+

data/lib/tagmv/command_line.rb

@@ -5,26 +5,50 @@ module Tagmv
     extend self
 
     Choice.options do
-      header "\033[1m\033[32mtagmv\033[0m\033[0m: A Directory-based Tagging Organizer"
+      header "A Directory-based Tagging Organizer"
+      header ""
+      header "Usage:"
+      header "    $ tagmv file1 file2 directory1 directory2 -t tag1 tag2 tag3 -d"
       header ""
       header "Options:"
 
       footer ""
-      footer "tagmv by James Robey (https://github.com/foucist/tagmv/)"
+      footer "tagmv by #{Tagmv::AUTHORS.join(', ')} (#{Tagmv::HOMEPAGE})"
+
+      option :dry_run do
+        short '-d'
+        long '--dry-run'
+        desc 'Check to see what gets moved where'
+      end
+
+      option :reorder do
+        short '-r'
+        long '--reorder'
+        desc 'Move all tagged files & directories into order of tag usage [default]'
+      end
+
+      option :skip_reorder do
+        short '-s'
+        long '--skip-reorder'
+        desc "Skip reorder (for example: you are editing tagged files and don't want them moved around yet)"
+      end
 
-      option :tags, :required => true do
+      option :tags do
         short '-t'
         long '--tags *tags'
-        desc 'The hostname or ip of the host to bind to (default 127.0.0.1)'
+        desc 'Tags for your files or directories, as many as you want'
       end
     end
 
     def parse
-      return Choice.help if Choice.rest.empty?
+      return Choice.help if !Choice.choices[:reorder] && (Choice.choices.empty? || Choice.rest.empty?)
 
       opts = Hash.new
-      opts[:files] = Choice.rest
-      opts[:tags]  = Choice.choices[:tags]
+      opts[:files]   = Choice.rest
+      opts[:dry_run] = Choice.choices[:dry_run]
+      opts[:tags]    = Choice.choices[:tags]
+      opts[:reorder] = Choice.choices[:reorder]
+      opts[:skip_reorder]= Choice.choices[:skip_reorder]
       opts
     end
   end

data/lib/tagmv/filesystem.rb

@@ -7,25 +7,42 @@ module Tagmv
       attr_accessor :root
     end
 
-    attr_reader :tags, :files, :tag_order, :top_level_tags
+    attr_reader :tags, :files, :reorder, :tag_order, :top_level_tags
     def initialize(opts={})
-      @tags =  opts[:tags].map {|t| scrub_tag(t) }
-      @files = opts[:files].map {|f| File.expand_path(f) }.select {|f| File.exist?(f) }
+      @tags =  scrub_tags(opts[:tags])
+      @files = opts[:files]
+      @dry_run = opts[:dry_run]
+      @reorder = opts[:reorder]
       @tag_order = opts[:tag_order]
       @top_level_tags = opts[:top_level_tags]
     end
 
-    def scrub_tag(tag)
-      # only keep legit file characters & remove trailing periods
-      tag.gsub(/[^0-9A-Za-z\.\-\_]|[\.]+$/, '')
+    def scrub_tags(tags)
+      # only keep legit file characters & remove trailing periods, remove duplicates after
+      bad_chars =  /^[\-]|[^0-9A-Za-z\.\-\_]|[\.]+$/
+      tags.map {|t| t.gsub(bad_chars, '') }.uniq
     end
 
-    def tag_order
-      top_level_tags | @tag_order
+    def scrub_files
+      files.select do |file|
+        path = File.expand_path(file)
+        if File.exist?(path)
+          path
+        else
+          puts "tmv: rename #{file} to #{target_dir}/#{File.basename(file)}: #{Errno::ENOENT.exception}"
+          false
+        end
+      end
+    end
+
+    def tags_in_order
+      return tags unless reorder
+
+      (top_level_tags | tag_order) & tags
     end
 
     def tag_dirs
-      (tag_order & tags).map {|x| x.gsub(/$/, '.') }
+      tags_in_order.map {|x| x.gsub(/$/, '-') }
     end
 
     def target_dir
@@ -33,16 +50,31 @@ module Tagmv
     end
 
     def prepare_dir
-      FileUtils.mkdir_p(target_dir) 
+      @@prepare_dir ||= Hash.new do |h, key|
+        h[key] = FileUtils.mkdir_p(key, options)
+      end
+      @@prepare_dir[target_dir]
     end
 
     def move_files
-      FileUtils.mv(files, target_dir)
+      # skip duplicate moves
+      return if reorder && scrub_files.size == 1 && (scrub_files.first.sub(target_dir + '/','') !=~ /\//)
+
+      FileUtils.mv(scrub_files, target_dir, options)
     rescue ArgumentError
     end
 
     def transfer
       prepare_dir && move_files
     end
+
+    private
+    def options
+      if @dry_run
+        {noop: true, verbose: true}
+      else
+        {}
+      end
+    end
   end
 end

data/lib/tagmv/options.rb

@@ -0,0 +1,24 @@
+module Tagmv
+  class Options
+    attr_accessor :additions
+    def initialize(opts = {})
+      @additions = opts
+    end
+
+    def input
+      Tagmv::CommandLine.parse || {}
+    end
+
+    def load_config
+      Tagmv::Config.new.load
+    end
+
+    def options
+      return if @options
+
+      @options = load_config
+      @options.merge(additions)
+      @options.merge(input)
+    end
+  end
+end

data/lib/tagmv/prune_path.rb

@@ -6,7 +6,7 @@ module Tagmv
     end
 
     def tag_dir?
-      path =~ /\.$/ && path !~ Tagmv::Tree.false_tag_regex
+      path =~ /..-$/ && path !~ Tagmv::Tree.false_tag_regex
     end
 
     def empty_dir?

data/lib/tagmv/runner.rb

@@ -2,27 +2,32 @@ module Tagmv
   module Runner
     extend self
 
-    def tree
-      @tree ||= Tagmv::Tree.scan_tree_entries
-    end
-
-    def update_tree
-      opts = Tagmv::CommandLine.parse
-      tree.with(opts)
-    end
-
-    def move_files
+    def reorder_files
       tree.entries.each do |entry|
-        tfs = Tagmv::Filesystem.new(tags: entry.tags, files: entry.files, tag_order: tree.tag_order, top_level_tags: @opts[:top_level_tags])
-        tfs.transfer
+        fs_options = options.merge(tags: entry.tags, files: entry.files, tag_order: tree.tag_order, reorder: true)
+        Tagmv::Filesystem.new(fs_options).transfer
       end
     end
 
+    def move_new_files
+      tree.entries << Entry.new(options)
+      fs_options = options.merge(tag_order: tree.tag_order, reorder: false)
+      Tagmv::Filesystem.new(fs_options).transfer
+    end
+
     def run
-      @opts = Tagmv::Config.new.load
-      update_tree
-      move_files
+      reorder_files unless options[:skip_reorder]
+      move_new_files unless options[:files].empty?
       Tagmv::PrunePath.prune_tag_dirs
     end
+
+    private
+    def tree
+      @tree ||= Tagmv::Tree.scan_tree_entries
+    end
+
+    def options
+      @options ||= Tagmv::Options.new.options
+    end
   end
 end

data/lib/tagmv/tree.rb

@@ -22,14 +22,20 @@ module Tagmv
 
     def self.false_tag_regex
       # detect when there's a false tag i.e. tag2. in path/to/tag1./not_a_tag/tag2./
-      /\/.+\.\/[^.]+\/.+\./
+      /\/.+-\/[^-]+\/.+-/
+      #/\/(.*[^-]\/|[^\/]{0,1}?-)/
     end
+
     def self.tags_in_path_regex
-      /\/\K.+?(?=\.\/)/
+      /[^(\.|\-)\/]\K.+?(?=\-\/)/
     end
 
     def self.path_has_file_regex
-      /#{tags_in_path_regex}.*[^\.]$/
+      /#{tags_in_path_regex}.*[^\-]$/
+    end
+
+    def self.file_in_tag_dir
+      /.+(\-\/[^\/]+)$/
     end
 
     def self.tags(file)
@@ -37,22 +43,12 @@ module Tagmv
       file[Filesystem.root.length..-1].scan(tags_in_path_regex).reject {|x| x =~ /\//}
     end
 
-    def self.empty_dirs
-      files = Find.find(Filesystem.root).select {|x| x =~ path_has_file_regex }
-      tree = Tree.new
-      files.map do |file|
-        next if file =~ false_tag_regex
-        tree.with(files: [file], tags: tags(file))
-      end
-      tree
-    end
-
     def self.scan_tree_entries
-      files = Find.find(Filesystem.root).select {|x| x =~ path_has_file_regex }
+      files = Find.find(Filesystem.root).select {|x| x =~ path_has_file_regex }.select {|x| x =~ file_in_tag_dir }
       tree = Tree.new
-      files.map do |file|
-        next if file =~ /\/.+\.\/[^.]+\/.+\./  # break when /dev./oh/blah./foo
-        tree.with(files: [file], tags: tags(file))
+      files.each do |file|
+        next if file =~ false_tag_regex  # break when /dev./oh/blah./foo
+        tree.entries << Entry.new(files: [file], tags: tags(file))
       end
       tree
     end
@@ -62,12 +58,15 @@ module Tagmv
     # {"dev."=>{"book."=>{"javascript."=>{"Secrets_of_the_Javascript_Ninja.pdf"=>{}}, "ruby."=>{"rails_antipatterns.pdf"=>{}}}, "ruby."=>{"oh"=>{}, "tagmv"=>{}}}}
     def self.scan_tree_hash
       Dir.chdir(Filesystem.root)
-      Dir["**/**./*"].inject({}) do |hash,path|
+      
+      # reject /dev-/-, /dev-/j-/ and /dev-/notag/tag-
+      paths = Dir["**/*"].delete_if {|x| /\/(.*[^-]\/|[^\/]{0,1}?-)/ =~ x}
+      paths.inject({}) do |hash,path|
         tree = hash
         path.split("/").each do |n|
           tree[n] ||= {}
           tree = tree[n]
-          break if n[-1] != "."
+          break if n[-1] != "-"
         end
         hash
       end

data/lib/tagmv/version.rb

@@ -1,3 +1,5 @@
 module Tagmv
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
+  HOMEPAGE = "https://github.com/foucist/tagmv"
+  AUTHORS = ["James Robey"]
 end

data/tagmv.gemspec

@@ -6,11 +6,11 @@ require 'tagmv/version'
 Gem::Specification.new do |spec|
   spec.name          = "tagmv"
   spec.version       = Tagmv::VERSION
-  spec.authors       = ["James Robey"]
+  spec.authors       = Tagmv::AUTHORS
   spec.email         = ["james.robey+tagmv@gmail.com"]
   spec.summary       = %q{Tag your files by moving them into a tree-like tag structure}
   spec.description   = %q{Moves your files into directories that represent tags, these tags are kept organized as a hierarchy according to tag counts}
-  spec.homepage      = "https://github.com/foucist/tagmv/"
+  spec.homepage      = Tagmv::HOMEPAGE
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagmv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James Robey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,12 +114,13 @@ files:
 - lib/tagmv/config.rb
 - lib/tagmv/entry.rb
 - lib/tagmv/filesystem.rb
+- lib/tagmv/options.rb
 - lib/tagmv/prune_path.rb
 - lib/tagmv/runner.rb
 - lib/tagmv/tree.rb
 - lib/tagmv/version.rb
 - tagmv.gemspec
-homepage: https://github.com/foucist/tagmv/
+homepage: https://github.com/foucist/tagmv
 licenses:
 - MIT
 metadata: {}
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tag your files by moving them into a tree-like tag structure