spwn 0.1.1 → 0.1.2

data/lib/spwn.rb

@@ -35,9 +35,7 @@ class Spwn
     options = args.last.is_a?(Hash) ? args.last : {}
     return spawn_multiples( :dir, *args, &block ) unless options[:count].nil?
     name = args.first.is_a?(String) ? args.first : 'dir'
-
-    digit = @dirs.empty? ? '1' : next_digit( @dirs.last )
-    path = File.join(Dir.pwd, "#{name}#{digit}")
+    path = File.join(Dir.pwd, next_dirname(name))
     Dir.mkdir(path)
     @dirs << new_dir = Dir.new(path)
     if block_given?
@@ -86,10 +84,15 @@ class Spwn
     items
   end
   def self.next_digit(item)
-    File.basename(item).match(/\d+/)[0].next
+    match = File.basename(item).match(/\d+/)
+    if match.nil? then '2' else match[0].next end
+  end
+  def self.next_dirname(name)
+    digit = @dirs.empty? ? '' : next_digit( @dirs.last )
+    "#{name}#{digit}"
   end
   def self.next_filename(name, ext)
-    digit = @files.empty? ? '1' : next_digit( @files.last )
+    digit = @files.empty? ? '' : next_digit( @files.last )
     "#{name}#{digit}.#{ext}"
   end
   def self.split_filename(fullname)

data/lib/spwn/version.rb

@@ -1,3 +1,3 @@
 class Spwn
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/spwn_spec.rb

@@ -14,7 +14,7 @@ describe Spwn do
     Spwn.extensions = old_exts
   end
 
-  context '#file' do
+  context 'file' do
     it "should be instance of File" do
       Spwn.file.should be_an_instance_of File
     end
@@ -26,21 +26,21 @@ describe Spwn do
       Spwn.files.should include Spwn.file
     end
     it "should have a common file name" do
-      File.basename(Spwn.file).should match /\Afile\d+/
+      File.basename(Spwn.file).should match /\Afile\d*/
     end
     it "should increment the file name" do
-      pattern = /\Afile(\d+)(?:.\w*)?/
+      pattern = /\Afile(\d+)?(?:.\w*)?/
       Spwn.file
       expect {
         3.times { Spwn.file }
       }.to change {
         # the digit in the filename for the last spawned file
-        File.basename(Spwn.files.last).match(pattern)[1].to_i
-      }.from(1).to(4)
+        File.basename(Spwn.files.last).match(pattern)[1]
+      }.from(nil).to('4')
     end
     it "should allow you to define a name" do
       file = Spwn.file('candy', ext: 'html')
-      File.basename(file).should == 'candy1.html'
+      File.basename(file).should == 'candy.html'
     end
     it "should use a random extension" do
       ext = File.extname(Spwn.file).delete '.'
@@ -75,17 +75,18 @@ describe Spwn do
       Spwn.dirs.should include dir
     end
     it "should have a common dir name" do
-      File.basename(dir).should match /\Adir\d+/
+      File.basename(dir).should match /\Adir\d*/
     end
     it "should increment the dir name" do
-      pattern = /\Adir(\d+)/
+      pattern = /\Adir(\d+)?/
+      puts Spwn.dirs
       Spwn.dir
       expect {
         3.times { Spwn.dir }
       }.to change {
         # the digit in the filename for the last spawned file
-        File.basename(Spwn.dirs.last).match(pattern)[1].to_i
-      }.from(1).to(4)
+        File.basename(Spwn.dirs.last).match(pattern)[1]
+      }.from(nil).to('4')
     end
     it "should cd into the dir if a block is given" do
       Spwn.dir do |directory|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spwn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: