writer 0.1.0 → 0.1.1

data/README.md

@@ -35,6 +35,18 @@ $ wr hello world
 #=> Creates a file named `hello` with the content `world`
 ```
 
+## Now supports the Ruby interactive shell!
+
+```
+$ irb
+> require 'writer'
+#=> true
+> wr 'hello.txt', 'world'
+#=>""
+> File.open('hello.txt').read
+#=> "world\n"
+```
+
 ## Use a template
 
 The Writer will copy a template file's contents into your new file

data/lib/writer/file_creator.rb

@@ -3,18 +3,16 @@ require "writer/overwrite_prevention"
 module Writer
   class FileCreator
     class << self
-      attr_accessor :name, :content
+      def create!(filename, content)
+        name = OverwritePrevention.adjust(filename)
+        content = content
 
-      def create!(name, content)
-        @name = OverwritePrevention.adjust(name)
-        @content = content
-
-        create_file
-        return file
+        create_file(name, content)
+        File.open(name, 'r')
       end
 
       private
-      def create_file
+      def create_file(name, content)
         File.open(name, 'w') do |f|
           f.puts content || template
         end
@@ -25,10 +23,6 @@ module Writer
           File.open(Writer.template_path).read
         end
       end
-
-      def file
-        File.open(name, 'r')
-      end
     end
   end
 end

data/lib/writer/overwrite_prevention.rb

@@ -1,25 +1,61 @@
 module Writer
   class OverwritePrevention
-    def self.adjust(name)
-      count = 1
+    class << self
+      def adjust(filename)
+        name = fix_standard(filename)
+        name ||= fix_no_extension(filename)
+        name ||= fix_no_base(filename)
+        name ||= fix_no_dots(filename)
+        name
+      end
+
+      def fix_standard(name)
+        if /.+\..+/ =~ name
+          parts = name.split('.')
+          basename = parts[0..-2].join('.')
+          extension = parts.last
 
-      while File.exists?(name)
-        name = append_count(name, count +=1)
+          fix_name(name, basename, extension)
+        end
       end
 
-      name
-    end
+      def fix_no_extension(name)
+        if /\.$/ =~ name
+          basename = name.gsub('.', '')
 
-    def self.append_count(name, count)
-      if (split = name.split('.')).length > 1
-        ext = split.last
-        split.delete(ext)
-        name = split.join('.')
+          fix_name(name, basename)
+        end
       end
 
-      name = name.gsub(/--\d$/,'')
+      def fix_no_base(name)
+        if /^\./ =~ name
+          fix_name(name)
+        end
+      end
+
+      def fix_no_dots(name)
+        unless name.include?('.')
+          fix_name(name)
+        end
+      end
 
-      [name + "--#{count}", '.', ext].join
+      private
+      def fix_name(name, base = nil, ext = nil)
+        to_fix = base || name
+        count = 1
+
+        while File.exists?(name)
+          name = append_count(to_fix, count += 1)
+          name << ".#{ext}" if base
+        end
+
+        name
+      end
+
+      def append_count(name, count)
+        name = name.gsub(/--\d*$/, '')
+        [name, "--", count].join
+      end
     end
   end
 end

data/lib/writer/version.rb

@@ -1,3 +1,3 @@
 module Writer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/writer_spec.rb

@@ -21,20 +21,44 @@ describe Writer do
     file.read.should == "\n"
   end
 
-  it "prevents overwriting" do
-    Writer.write!
-    Writer.write!
+  it "plays well with no dots" do
+    file = Writer.write!('nodots')
+    File.basename(file).should == 'nodots'
 
-    File.open('2012-01Jan-03--2.md')
-    File.open('2012-01Jan-03--3.md')
+    file = Writer.write!('nodots')
+    File.basename(file).should == 'nodots--2'
   end
 
-  it "preserves periods" do
+  it "plays well with a dot at the end" do
+    file = Writer.write!('dot.')
+    File.basename(file).should == 'dot.'
+
+    file = Writer.write!('dot.')
+    File.basename(file).should == 'dot--2.'
+  end
+
+  it "plays well with a dot at the beginning" do
+    file = Writer.write!('.dot')
+    File.basename(file).should == '.dot'
+
+    file = Writer.write!('.dot')
+    File.basename(file).should == '.dot--2'
+  end
+
+  it "plays well with multiple dots" do
     Writer.write!('some.jquery.file')
     file = Writer.write!('some.jquery.file')
     File.basename(file).should == 'some.jquery--2.file'
   end
 
+  it "prevents overwriting" do
+    Writer.write!
+    Writer.write!
+
+    File.open('2012-01Jan-03--2.md')
+    File.open('2012-01Jan-03--3.md')
+  end
+
   it "creates the file with your custom name" do
     filename = "My custom filename.txt"
     Writer.write!(filename)
@@ -60,8 +84,14 @@ def cleanup_files
   File.delete('2012-01Jan-03--3.md')
   File.delete('2012-01Jan-03--4.md')
   File.delete('2012-01Jan-03--5.md')
+  File.delete('nodots')
+  File.delete('nodots--2')
+  File.delete('dot.')
+  File.delete('dot--2.')
   File.delete('some.jquery.file')
   File.delete('some.jquery--2.file')
   File.delete('.template')
   File.delete('My custom filename.txt')
+  File.delete('.dot')
+  File.delete('.dot--2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: writer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70117863945520 !ruby/object:Gem::Requirement
+  requirement: &70289521172480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117863945520
+  version_requirements: *70289521172480
 description: Easily start a new file to write in.
 email:
 - joe@joesak.com