fled 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2465c8ae77d6b83eddf259b123cb2c764537b37e
+  data.tar.gz: 44e5f6a8fc628a05b91aa7f8606a7645cda98093
+SHA512:
+  metadata.gz: 0b156984f98bb7b2f050fca85e9f7a2c83d95aaafb50dd95b016bb8f2e4c5e542d2236ba51635a905e853249e11bb7f1c9932a064d7bfd722c7695a090f3e15b
+  data.tar.gz: 5f8a46312ce259f6106b63af33f5310c231f341d42ec9ea0cb51b96338f7dc7beab5b667c197959ba5423afca11d0e68266856562f2f176b3696e6e2ba7ece02

data/README.md

@@ -591,6 +591,11 @@ sub_sub_folder/  :2
 
 ## Changelog
 
+*Version v0.0.4*
+
+- New: Sort file listing (if gem naturalsort is installed, it is used too)
+- Fix: Non interactive run mode had a bug
+
 *Version v0.0.3*
 
 - New: Interactive mode with `-u`

data/bin/fled

@@ -79,12 +79,13 @@ class App
         exit 0
       end
       output_version if @options[:verbose]
+      is_interactive = @options[:interactive]
       update_listing!
-      edit_listing!
-      if @options[:interactive]
+      edit_listing! is_interactive
+      if is_interactive
         interactive_main_menu
       else
-        die! :nothing_edited if operations.empty?
+        return die! :nothing_edited if @operations.empty?
         print_script
       end
     else
@@ -108,11 +109,11 @@ class App
       @operations = ops_for_edited_listing(@listing, @listing_text, edited_listing)
     end
 
-    def edit_listing!
+    def edit_listing! is_interactive
       edited_listing = DTC::Utils::InteractiveEditor::edit(@edited_listing || @listing_text, ".yaml", @options[:editor])
       @edited_listing = edited_listing unless edited_listing.to_s.strip == ""
       update_operations! edited_listing
-      interactive_print_status
+      interactive_print_status if is_interactive
     end
 
     def print_script operations = @operations, preview = false
@@ -182,13 +183,13 @@ class App
     end
 
     def interactive_edit_listing # => "(E)dit listing"
-      edit_listing!
+      edit_listing! true
     end
 
     def interactive_revert_listing # => "(R)evert listing"
       @edited_listing = nil
       @operations = []
-      edit_listing!
+      edit_listing! true
     end
 
     def interactive_reconfigure
@@ -205,7 +206,7 @@ class App
         @options = @options.merge(new_options)
         status "Config updated"
         update_listing!
-        edit_listing!
+        edit_listing! true
       else
         @options = @options.merge(new_options)
         update_operations!

data/bin/irtoy

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'yaml'
+require 'optparse'
+require 'shellwords'
+begin
+  require 'dtc/utils'
+rescue LoadError => e
+  $:.unshift File.join(File.dirname(__FILE__),'../lib')
+  require 'dtc/utils'
+end
+fd = IO.sysopen(Dir['/dev/cu.usbmodem*'].first, "w+b")
+a = IO.new(fd,"w+b")
+
+vol_up = [
+"y\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x01\xF8\x00\x01\xF8\x00\x01\xF8\x03\xE0\x0F\xC0\x1F\x00~\x00\x00~\x00\xFC\x00\x00\xFC\x00\x00\xFC\x00\x00\xFC\x00\x00|\x01\xF8\x03\xE0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\a\xE0\x00\a\xE0\x0F\x80",
+"?\x00|\x01\xF8\x00\x00\x00\x00\x00",
+"\x7F\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x01\xF8\x00\x01\xF8\x00\x01\xF8\x03\xE0\x0F\xC0\x1F\x00~\x00\x00~\x00\xFC\x00\x00\xFC\x00\x00\xFC\x00\x00\xFC\x00\x00|\x01\xF8\x03\xE0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\a\xE0\x00\a\xE0\x0F\x80",
+"?\x00|\x01\xF8\x00\x00\x00\x00\x00",
+"\x7F\xFF\xFF\xFF\xFF\x00\x00\x00\x00\x01\xF0\x00\x01\xF0\x00\x01\xF0\x03\xE0\x0F\x80\x1F\x00|\x00\x00|\x00\xF8\x00\x00\xF8\x00\x00\xF8\x00\x00|\x00\x00|\x01\xF0\x03\xE0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\a\xE0\x00\a\xF0\x0F\x80",
+"?\x00|\x01\xF8\x00\x00\x00\x00\x00",
+"\x7F\xFF\xFF\xFF\xFF\x80\x00\x00\x00\x01\xF0\x00\x01\xF8\x00\x01\xF8\x03\xE0\x0F\xC0\x1F\x00~\x00\x00~\x00\xFC\x00\x00\xF8\x00\x00\xFC\x00\x00|\x00\x00|\x01\xF8\x03\xE0\x00\x03\xF0\x00\x03\xF0\x00\x03\xF0\x00\x01\xF0\a\xE0\x00\a\xE0\x0F\x80",
+"?\x00|\x01\xF8\x00\x00\x00\x00\x00",
+
+
+]
+
+DTC::Utils::MiniSelect.run do |sel|
+  sel.add_read(a) do |sel, ev, fd, data|
+    p data
+  end
+  while true
+    vol_up.each do |v|
+      a.write(v)
+    end
+    sleep 3
+    puts "written"
+  end
+end

data/lib/dtc/utils/text/ansi.rb

@@ -0,0 +1,63 @@
+
+module DTC
+  module Utils
+    module Text
+      module ANSI
+        DISPLAY_ATTRIBUTES = ({
+          :reset => 0,
+          :bold => 1,
+          :underline => 4,
+          :reverse => 7,
+          :black => 30,
+          :red => 31,
+          :green => 32,
+          :yellow => 33,
+          :blue => 34,
+          :magenta => 35,
+          :cyan => 36,
+          :white => 37,
+          :bg_black => 40,
+          :bg_red => 41,
+          :bg_green => 42,
+          :bg_yellow => 43,
+          :bg_blue => 44,
+          :bg_magenta => 45,
+          :bg_cyan => 46,
+          :bg_white => 47,
+        })
+        def self.escape_for_display_attributes *attrs
+          "\033[#{attrs.map { |e| DISPLAY_ATTRIBUTES[e] || e}.join(";")}m"
+        end
+        def self.coloured_string *att_text
+          if att_text.last.is_a?(FalseClass)
+            att_text.pop
+          else
+            unless (att_text.select { |e| e.is_a?(Symbol) }.last == :reset)
+              att_text.push :reset
+            end
+          end
+          att_text.map { |t|
+            t.is_a?(String) ? t : escape_for_display_attributes(*Array(t))
+          }.join("")
+        end
+      end
+    end
+  end
+end
+
+mods = [ :reset, :bold, :underline, :reverse ]
+fgs = [ :black, :red, :green, :yellow, :blue, :magenta, :cyan, :white ]
+bgs = DTC::Utils::Text::ANSI::DISPLAY_ATTRIBUTES.keys - fgs - mods
+bg_width = bgs.map { |e| e.to_s.length }.max + 1
+fgs_width = fgs.map { |e| e.to_s.length }.max + 1
+mods.each do |mod|
+  puts "\nMode: #{mod.inspect}"
+  fgs.each do |fg|
+    print DTC::Utils::Text::ANSI::coloured_string(mod, fg, fg.to_s.rjust(fgs_width), :reset, " ")
+    bgs.each do |bg|
+      print DTC::Utils::Text::ANSI::coloured_string(mod, fg, bg, bg.to_s.rjust(bg_width), :reset, " ")
+    end
+    puts ""
+  end
+end
+# puts DTC::Utils::Text::ANSI::coloured_string("hello", :red, " there !", :reset)

data/lib/dtc/utils/visitor/folder.rb

@@ -59,12 +59,32 @@ module DTC
           max_depth = options.delete(:max_depth) { -1 }
           filter = options.empty? ? visitor :
             FilenameFilteringVisitor.new(visitor, options)
-          accept_path filter, File.expand_path(path), max_depth
+          accept_path filter, File.expand_path(path), max_depth, (options[:sorted].nil? ? true : options[:sorted])
           visitor
         end
-        def self.accept_path visitor, path, max_depth = -1
-          dir = Dir.new(path)
+
+        begin
+          require 'forwardable'
+          require 'natural_sort'
+          def self.string_compare a, b
+            NaturalSort.comparator(a, b)
+          end
+        rescue LoadError
+          def self.string_compare a, b
+            a.casecmp(b)
+          end
+        end
+
+        def self.accept_path visitor, path, max_depth = -1, sorted
           return unless visitor.enter path
+          dir = Dir.new(path)
+          if sorted
+            dir = dir.each.to_a.sort do |a, b|
+              a_is_dir = File.directory?(File.join(path, a))
+              b_is_dir = File.directory?(File.join(path, b))
+              a_is_dir != b_is_dir ? (a_is_dir ? -1 : 1) : self.string_compare(a, b)
+            end
+          end
           dir.each do |f|
             full_path = File.join(path, f)
             next if f == "." || f == ".."
@@ -73,7 +93,7 @@ module DTC
               if max_depth == 0
                 visitor.leave if visitor.enter(full_path)
               else
-                self.accept_path(visitor, full_path, max_depth - 1)
+                self.accept_path(visitor, full_path, max_depth - 1, sorted)
               end
             else
               visitor.add f, full_path

data/lib/fled.rb

@@ -5,7 +5,7 @@ module FlEd
   require 'fled/file_listing'
   require 'fled/file_listing_builder'
 
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   # Convert file listing operation list
   # to bash-script friendly script

data/tests/readme.rb

@@ -315,6 +315,10 @@ readme do
       'New: Editor and diff tool are configurable from configuration files',
       'Meta: Refactoring of code',
     ],
+    'v0.0.4' => [
+      'New: Sort file listing (if gem naturalsort is installed, it is used too)',
+      'Fix: Non interactive run mode had a bug',
+    ],
   }).sort { |a, b| b[0] <=> a[0] }.each do |version, changes|
     em "Version #{version}"
     li *changes

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fled
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Eric Doughty-Papassideris
@@ -19,47 +18,48 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- bin/fled
+- bin/irtoy
+- lib/dtc/utils.rb
 - lib/dtc/utils/exec.rb
 - lib/dtc/utils/interactive_edit.rb
 - lib/dtc/utils/meta.rb
 - lib/dtc/utils/mini_select.rb
+- lib/dtc/utils/text.rb
+- lib/dtc/utils/text/ansi.rb
 - lib/dtc/utils/text/html.rb
 - lib/dtc/utils/text/line_writer.rb
-- lib/dtc/utils/text.rb
+- lib/dtc/utils/visitor.rb
 - lib/dtc/utils/visitor/dsl.rb
 - lib/dtc/utils/visitor/folder.rb
-- lib/dtc/utils/visitor.rb
-- lib/dtc/utils.rb
+- lib/fled.rb
 - lib/fled/file_listing.rb
 - lib/fled/file_listing_builder.rb
-- lib/fled.rb
-- bin/fled
 - tests/helper.rb
 - tests/readme.rb
 - tests/test_operations.rb
-- README.md
 homepage: http://github.com/ddlsmurf/fled
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FlEd lets you edit file names and paths in your favourite editor
 test_files: []