fled 0.0.1 → 0.0.2

data/README.md

@@ -3,11 +3,6 @@
 
 `fled` lets you organise your files and folders in your favourite editor
 
-## Disclaimer
-
-Warning: This is a very dangerous tool. The author recommends you do not
-  use it. The author cannot be held responsible in any case.
-
 ## Introduction
 
 `fled` enumerates a folder and its files, and generates a text listing.
@@ -17,13 +12,17 @@ your files and folders around as-per your edits.
 
 **You should review that shell script very carefully before running it.**
 
+### Install
+
+You can install using `gem install fled`.
+
 ### Philosophy
 
 `fled` only generates text, it does not perform any operation directly.
 
-The design optimises for making the edits very simple. The consequence of
-this is that very small edits can have large consequences, which makes
-this a **very dangerous** tool. But so is `rm` and the rest of the shell anyway...
+The design optimises for making the edits very simple. This means that very small
+edits can have large consequences, which makes this a **very dangerous** tool.
+But so is `rm` and the rest of the shell anyway...
 
 ### Caveats
 
@@ -35,6 +34,10 @@ cases defined, any help is much appreciated.
 
 You should be scared when using `fled`.
 
+### Test status
+
+[![Build Status](https://secure.travis-ci.org/ddlsmurf/fled.png?branch=master&this_url_now_ends_with=.png)](http://travis-ci.org/ddlsmurf/fled)
+
 ### Examples
 
 Print help text and option list
@@ -163,7 +166,7 @@ If an indent is forgotten:
 
 Generates:
 
-    mv folder/folder_two/file_three folder/file_one/file_three
+    mv folder/folder_two/file_three folder/file_three
 
 ### All together
 
@@ -224,7 +227,28 @@ Generates:
     mv folder sub_sub_folder/sub_folder/folder
     mv sub_sub_folder/file.txt sub_sub_folder/sub_folder/folder/file.txt
 
+## Changelog
+
+*Version v0.0.2*
+
+- Fix: Unreadable directories now ignored
+- Fix: Version display and DRYed
+- Fix: Moving files under files now moves up to parent folder of destination
+- Meta: Travis-CI integration
+
+*Version v0.0.1*
+
+- First version
+
+## Disclaimer
+
+Warning: This is a very dangerous tool. The author recommends you do not
+  use it. The author cannot be held responsible in any case.
+
 ## Contributors
 
 - [Eric Doughty-Papassideris](http://github.com/ddlsmurf)
 
+## Licence
+
+[GPLv3](http://www.gnu.org/licenses/gpl-3.0.html)

data/bin/fled

@@ -146,7 +146,7 @@ class App
     end
 
     def output_version
-      $stderr.puts "#{File.basename(__FILE__)} version #{VERSION}"
+      $stderr.puts "#{File.basename(__FILE__)} version #{FlEd::VERSION}"
     end
 end
 App.new.run

data/lib/dtc/utils/file_visitor.rb

@@ -17,6 +17,7 @@ module DTC
         @folders.pop
       end
       def self.browse path, visitor, max_depth = -1
+        return unless File.readable?(path)
         dir = Dir.new(path)
         return unless visitor.enter_folder path
         dir.each do |f|

data/lib/fled/file_listing.rb

@@ -89,7 +89,7 @@ module FlEd
         next if path.any? { |o| o[:error] }
         if target[:name] != "" && !target[:uid]
           operations << [:mk, self.path_of(target).map { |o| o[:name] }]
-          fake_source = {:name => target[:name]}
+          fake_source = {:name => target[:name], :dir => true}
           fake_source[:parent] = running_source[path.last[:source][:uid]] unless path.empty?
           target_uid = "new_#{running_source.count}"
           target_uid += "_" while @objects_by_id[target_uid] || running_source[target_uid]
@@ -111,11 +111,16 @@ module FlEd
             if new_name != target[:name]
               pending_renames << [:renamed, target, target[:name]]
             end
+            if (target_parent = target[:parent])
+              until !target_parent || !target_parent[:source] || target_parent[:source][:dir]
+                target_parent = target_parent[:parent]
+              end
+            end
             source_path = running_source.path_of(source).map { |o| o[:name] }
             target[:name] = source[:name] = new_name
             operations << [:moved,
               source_path,
-              self.path_of(target).map { |o| o[:name] }
+              self.path_of(target_parent).map { |o| o[:name] } + [target[:name]]
             ]
             if target[:parent]
               source[:parent] = running_source[target[:parent][:uid]]

data/lib/fled.rb

@@ -4,7 +4,7 @@ require 'shellwords'
 module FlEd
   require 'fled/file_listing'
 
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   def self.operation_list_to_bash ops
     ops = ops.map do |op|

data/tests/readme.rb

@@ -75,11 +75,6 @@ end
 readme = ExampleDSLWriter.run do
   h1 "FlEd", '`fled` lets you organise your files and folders in your favourite editor'
 
-  h2 "Disclaimer", <<-MD
-      Warning: This is a very dangerous tool. The author recommends you do not
-        use it. The author cannot be held responsible in any case.
-  MD
-
   h2 "Introduction", <<-MD
   `fled` enumerates a folder and its files, and generates a text listing.
   You can then edit that listing in your favourite editor, and save changes.
@@ -90,12 +85,16 @@ readme = ExampleDSLWriter.run do
   
   MD
 
+  h3 "Install", <<-MD
+    You can install using `gem install fled`.
+  MD
+
   h3 "Philosophy", <<-MD
     `fled` only generates text, it does not perform any operation directly.
 
-    The design optimises for making the edits very simple. The consequence of
-    this is that very small edits can have large consequences, which makes
-    this a **very dangerous** tool. But so is `rm` and the rest of the shell anyway...
+    The design optimises for making the edits very simple. This means that very small
+    edits can have large consequences, which makes this a **very dangerous** tool.
+    But so is `rm` and the rest of the shell anyway...
   MD
 
   h3 "Caveats", <<-MD
@@ -108,6 +107,8 @@ readme = ExampleDSLWriter.run do
     You should be scared when using `fled`.
   MD
 
+  h3 "Test status", "[![Build Status](https://secure.travis-ci.org/ddlsmurf/fled.png?branch=master&this_url_now_ends_with=.png)](http://travis-ci.org/ddlsmurf/fled)"
+
   h3 "Examples"
   [
     ["Print help text and option list", "fled --help"],
@@ -250,7 +251,29 @@ readme = ExampleDSLWriter.run do
           file.txt       :3
   EXAMPLE
 
+  h2 "Changelog"
+  ({
+    'v0.0.1' => ['First version'],
+    'v0.0.2' => [
+      'Fix: Unreadable directories now ignored',
+      'Fix: Version display and DRYed',
+      'Fix: Moving files under files now moves up to parent folder of destination',
+      'Meta: Travis-CI integration',
+    ],
+  }).sort { |a, b| b[0] <=> a[0] }.each do |version, changes|
+    em "Version #{version}"
+    changes.each { |change| li change }
+  end
+
+  h2 "Disclaimer", <<-MD
+      Warning: This is a very dangerous tool. The author recommends you do not
+        use it. The author cannot be held responsible in any case.
+  MD
+
   h2 "Contributors"
   li "[Eric Doughty-Papassideris](http://github.com/ddlsmurf)"
+
+  h2 "Licence", "[GPLv3](http://www.gnu.org/licenses/gpl-3.0.html)"
+
 end
 puts readme

data/tests/test_operations.rb

@@ -165,6 +165,33 @@ class TestOperations < Test::Unit::TestCase
     TEST
     assert_equal [[:mv, 'folder/sous/truc', 'truc']], ops
   end
+  def test_reparent_under_file
+    ops = @fs.operations_if_edited_as <<-TEST
+      folder :0
+        sous :1
+          truc :2
+            truc.txt :3
+    TEST
+    assert_equal [[:mv, "folder/truc.txt", "folder/sous/truc.txt"]], ops
+  end
+  def test_reparent_under_file_at_root
+    ops = TestFS.new do
+      folder(0) {
+        file_one(1)
+        file_two(2)
+        file_three(3)
+      }
+    end.operations_if_edited_as <<-TEST
+      file_one :1
+        file_two :2
+          file_three :3
+    TEST
+    assert_equal [
+      [:mv, "folder/file_one", "file_one"],
+      [:mv, "folder/file_two", "file_two"],
+      [:mv, "folder/file_three", "file_three"],
+    ], ops
+  end
   def test_reparent_impact_on_mkdir
     ops = @fs.operations_if_edited_as <<-TEST
       folder :0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fled
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: