epitools 0.5.39 → 0.5.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1ff3a3fd6c4acf8419fa95fb87354aad10def9
-  data.tar.gz: 2cb1a53c82da0c000945fa678fcf2c6cff755956
+  metadata.gz: 11d3c2b4e8f320ff75a614b617aa3571a8e4a89c
+  data.tar.gz: a33291591096efd021c4d8647d5e73e23dffa745
 SHA512:
-  metadata.gz: 8805fe2849572feaa48d050842c02f4993a055011c514fb96adf66f31e01f7bbed7800ba54302199061d777b8142925eb251de97d91c93a989f266329c828511
-  data.tar.gz: 54739fab89cc8e77d25bb3d8bc0e79197dde2caf1c3ca9fd2451a0699521d74754a1fe3a095288bae05b0a4bff19728b2404808ff8f1a5e1c7f0c23d81466de9
+  metadata.gz: 276e60d3e8028ebf5ebbac51ba8c33575f9c64bfc7997d828c13a8fd2a0a47d23a78e5f6f39b10d2de91cd16d8f7edb6435c842b3e274b0136604bbb9d45ff03
+  data.tar.gz: 284f2fa58e0fd4dc8e536b66515fce57a61a1fd7035623ea4360ebdf787c97c938f47eff235ca5ab47e4f424ea778e519fe8d0c306a372947a4aa4e3a1adca6f

data/Rakefile

@@ -11,3 +11,7 @@ end
 task :install => :build do
   system "gem install epitools-#{gem_version}.gem"
 end
+
+task :pry do
+  system "pry --gem"
+end

data/VERSION

@@ -1 +1 @@
-0.5.39
+0.5.41

data/lib/epitools/core_ext.rb

@@ -10,6 +10,7 @@ require 'epitools/core_ext/enumerable'
 require 'epitools/core_ext/hash'
 require 'epitools/core_ext/numbers'
 require 'epitools/core_ext/truthiness'
+require 'epitools/core_ext/range'
 require 'epitools/core_ext/misc'
 
 ##############################################################################

data/lib/epitools/core_ext/misc.rb

@@ -169,28 +169,6 @@ end
 
 
 
-class Range
-
-  #
-  # Pick a random number from the range.
-  #
-  def rand
-    Kernel.rand(self)
-  end
-
-  #
-  # The middle element of this range.
-  #
-  def middle
-    (min + max) / 2
-  end
-
-  
-
-end
-
-
-
 class Struct
 
   #

data/lib/epitools/core_ext/range.rb

@@ -0,0 +1,35 @@
+class Range
+
+  #
+  # Pick a random number from the range.
+  #
+  def rand
+    Kernel.rand(self)
+  end
+
+  #
+  # The middle element of this range.
+  #
+  def middle
+    (min + max) / 2
+  end
+
+  #
+  # Return a new range which is the intersection of the two ranges
+  #
+  def &(other)
+    mins, maxes = minmax.zip(other.minmax)
+
+    (mins.max..maxes.min)
+  end
+  
+  #
+  # Return a new range which is the union of the two ranges
+  #
+  def |(other)
+    mins, maxes = minmax.zip(other.minmax)
+
+    (mins.min..maxes.max)
+  end
+  
+end

data/lib/epitools/path.rb

@@ -175,8 +175,13 @@ class Path
   def ext=(newext)
     if newext.blank?
       @ext = nil
-    elsif newext.startswith('.')
-      @ext = newext[1..-1]
+      return
+    end
+
+    newext = newext[1..-1] if newext.startswith('.')
+
+    if newext['.']
+      self.filename = basename + '.' + newext
     else
       @ext = newext
     end
@@ -473,7 +478,7 @@ class Path
 
     IO.popen(cmd, "rb", :err=>[:child, :out]) do |io|
       result = io.each_line.to_a
-      error = {cmd: cmd, result: result.to_s}.inspect
+      error = {:cmd => cmd, :result => result.to_s}.inspect
       raise error if result.any?
     end
   end
@@ -692,34 +697,106 @@ class Path
     Path.cd(path, &block)
   end
 
+  #
+  # A private method for handling arguments to mv and rename.
+  #
+  def arg_to_path(arg)
+    case arg
+    when String, Path
+      Path[arg]
+    when Hash
+      self.with(arg)
+    else
+      raise "Error: argument must be a path (a String or a Path), or a hash of attributes to replace in the Path."
+    end
+  end
+  private :arg_to_path
+
+  #
+  # Renames the file, but doesn't change the current Path object, and returns a Path that points at the new filename.
   #
   # Examples:
+  #   Path["file"].rename("newfile")      #=> Path["newfile"]
   #   Path["SongySong.mp3"].rename(:basename=>"Songy Song")
   #   Path["Songy Song.mp3"].rename(:ext=>"aac")
   #   Path["Songy Song.aac"].rename(:dir=>"/music2")
   #   Path["/music2/Songy Song.aac"].exists? #=> true
   #
-  def rename(options)
-    raise "Options must be a Hash" unless options.is_a? Hash
-    dest = self.with(options)
+  def rename(arg)
+    dest = arg_to_path(arg)
 
     raise "Error: destination (#{dest.inspect}) already exists" if dest.exists?
+    raise "Error: can't rename #{self.inspect} because source location doesn't exist." unless exists?
+
     File.rename(path, dest)
+    dest
+  end
+  alias_method :ren, :rename
 
-    update(dest)
+  #
+  # Works the same as "rename", but the destination can be on another disk.
+  #
+  def mv(arg)
+    dest = arg_to_path(arg)
 
-    self
+    raise "Error: can't move #{self.inspect} because source location doesn't exist." unless exists?
+
+    FileUtils.mv(path, dest)
+    dest
+  end
+  alias_method :move, :mv
+
+  #
+  # Rename the file and change this Path object so that it points to the destination file.
+  #
+  def rename!(arg)
+    update(rename(arg))
+  end
+  alias_method :ren!, :rename!
+
+  #
+  # Moves the file (overwriting the destination if it already exists). Also points the current Path object at the new destination.
+  #
+  def mv!(arg)
+    update(mv(arg))
+  end
+  alias_method :move!, :mv!
+
+  #
+  # Find a backup filename that doesn't exist yet by appending "(1)", "(2)", etc. to the current filename.
+  #
+  def numbered_backup_file
+    return self unless exists?
+
+    n = 1
+    loop do
+      new_file = with(:basename => "#{basename} (#{n})")
+      return new_file unless new_file.exists?
+      n += 1
+    end
+  end
+
+  #
+  # Return a copy of this Path with ".bak" at the end
+  #
+  def backup_file
+    with(:filename => filename+".bak")
   end
 
   #
-  # Renames the file the specified full path (like Dir.rename.)
+  # Rename this file, "filename.ext", to "filename (1).ext" (or (2), or (3), or whatever number is available.)
+  # (Does not modify this Path object.)
   #
-  def rename_to(path)
-    rename :path=>path.to_s
+  def numbered_backup!
+    rename(numbered_backup_file)
   end
 
-  def rename_to!(path)
-    rename! :path=>path.to_s
+  #
+  # Rename this file, "filename.ext", to "filename.ext.bak".
+  # (Does not modify this Path object.)
+  #
+  def backup!
+    rename(backup_file)
   end
 
   #
@@ -748,10 +825,7 @@ class Path
 
   def cp_r(dest)
     FileUtils.cp_r(path, dest) #if Path[dest].exists?
-  end
-
-  def mv(dest)
-    FileUtils.mv(path, dest)
+    dest
   end
 
   def ln_s(dest)

data/lib/epitools/wm.rb

@@ -107,6 +107,8 @@ module WM
     # string is made up of regular text, plus <>'d keypresses
     # eg: "Hello<Ctrl-T><Ctrl-L><Ctrl-Shift-K><Return>!!!"
     #
+    # TODO: add `xdotool` support
+    #
     def send_keys(keys)
       xse(keys)
     end

data/spec/core_ext_spec.rb

@@ -636,6 +636,13 @@ describe Range do
     50.times { r.includes?(r.rand).should == true }
   end
 
+  it "does | and &" do
+    a = (1..10)
+    b = (5...21)
+    a & b == (5..10)
+    a | b == (1..20)
+  end
+
 end
 
 describe ObjectSpace do

data/spec/path_spec.rb

@@ -55,6 +55,10 @@ describe Path do
     path.ext.should == "mkv"
 
     path.filename[-4..-1].should == ".mkv"
+
+    path.ext += ".extra"
+    path.filename.should == "hello.mkv.extra"
+    path.ext.should == "extra"
   end
 
   it "replaces filename" do
@@ -208,7 +212,7 @@ describe Path do
     Path.pwd.should == start
   end
 
-  it "renames" do
+  it "renames/mvs" do
     path = Path.tmp
 
     path.rm
@@ -218,10 +222,49 @@ describe Path do
 
     old_name = path.to_s
 
-    path.rename(:ext=>".dat")
+    dest = path.rename(:ext=>".dat")
+
+    dest.to_s.should == old_name+".dat"
+    path.to_s.should == old_name
+    dest.to_s.should_not == old_name
+
+    dest.exists?.should == true
+    path.exists?.should == false
 
-    path.to_s.should == old_name+".dat"
+    path.touch
+    lambda { path.rename(:ext=>".dat") }.should raise_error
+    
+    dest.rm
+    path.rename!(:ext=>".dat")
     path.to_s.should_not == old_name
+    path.exists?.should == true
+
+    path.rm
+  end
+
+  it "backups" do
+    path = Path.tmp
+    path.rm
+    path.touch
+
+    dest = path.backup!
+    path.exists?.should == false
+    dest.exists?.should == true
+
+    dest.rm
+
+    path.touch
+    p path.numbered_backup_file
+
+    dest = path.numbered_backup!
+    path.touch
+    dest2 = path.numbered_backup!
+
+    dest.should_not == dest2
+    path.should_not == dest
+
+    dest.rm
+    dest2.rm
   end
 
   it "rms" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.39
+  version: 0.5.41
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,6 +58,7 @@ files:
 - lib/epitools/core_ext/misc.rb
 - lib/epitools/core_ext/numbers.rb
 - lib/epitools/core_ext/object.rb
+- lib/epitools/core_ext/range.rb
 - lib/epitools/core_ext/string.rb
 - lib/epitools/core_ext/truthiness.rb
 - lib/epitools/ezdb.rb