writer 0.0.1 → 0.0.2

data/.gitignore

@@ -1,5 +1,3 @@
-20*.md
-*.gem
 *.rbc
 .bundle
 .config

data/bin/wr

@@ -3,6 +3,7 @@
 require 'yaml'
 require 'writer'
 filename = ARGV[0]
+content = ARGV[1]
 
 if (load_config = File.open('config/writer.yml') rescue nil)
   config = YAML.load(load_config)
@@ -12,8 +13,4 @@ if (load_config = File.open('config/writer.yml') rescue nil)
   end
 end
 
-if filename
-  Writer.write!(filename)
-else
-  Writer.write!
-end
+Writer.write!(filename, content)

data/lib/writer/version.rb

@@ -1,3 +1,3 @@
 module Writer
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/writer.rb

@@ -4,8 +4,10 @@ require "writer/version"
 
 module Writer
   class << self
-    def write!(filename = todays_date_md)
-      create_file(filename)
+    def write!(name = default_filename, content = nil)
+      protect_from_overwrite(name)
+      create_file(content)
+      File.open(filename, 'r')
     end
 
     def configure
@@ -14,13 +16,33 @@ module Writer
     end
 
     private
-    def create_file(name)
-      File.open(name, 'w') do |f|
-        f.puts template
+    def protect_from_overwrite(name)
+      count = 1
+      while File.exists?(name)
+        name = append_count(name, count += 1)
       end
+      @filename = name
     end
 
-    def todays_date_md
+    def create_file(content = nil)
+      File.open(filename, 'w') do |f|
+        f.puts content || template
+      end
+    end
+
+    def append_count(name, count)
+      if (split = name.split('.')).length > 1
+        ext = split.last
+        split.delete(ext)
+        name = split.join
+      end
+
+      name = name.gsub(/--\d$/,'')
+
+      [name + "--#{count}", '.', ext].join
+    end
+
+    def default_filename
       date = Date.today
       date.strftime('%Y-%m%b-%d.md')
     end
@@ -34,5 +56,9 @@ module Writer
     def config
       @config ||= Configuration.new
     end
+
+    def filename
+      @filename
+    end
   end
 end

data/spec/writer_spec.rb

@@ -1,10 +1,6 @@
 require 'writer'
 
 describe Writer do
-  let(:file) do
-    File.open('2012-01Jan-03.md')
-  end
-
   before :each do
     Date.stub(:today) do
       Date.new(2012, 1, 3)
@@ -12,16 +8,22 @@ describe Writer do
   end
 
   after :all do
-    File.delete('2012-01Jan-03.md')
-    File.delete('.template')
-    File.delete('My custom filename.txt')
+    cleanup_files
   end
 
   it "creates today's file, blank" do
-    Writer.write!
+    file = Writer.write!
     file.read.should == "\n"
   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)
@@ -30,16 +32,22 @@ describe Writer do
 
   it "uses a template, if it exists" do
     body = "hello\nworld"
-
-    File.open('.template', 'w') do |f|
-      f.puts body
-    end
+    Writer.write!('.template', body)
 
     Writer.configure do |c|
       c.template_path = '.template'
     end
 
-    Writer.write!
+    file = Writer.write!
     file.read.should == body + "\n"
   end
 end
+
+def cleanup_files
+  File.delete('2012-01Jan-03.md')
+  File.delete('2012-01Jan-03--2.md')
+  File.delete('2012-01Jan-03--3.md')
+  File.delete('2012-01Jan-03--4.md')
+  File.delete('.template')
+  File.delete('My custom filename.txt')
+end

metadata

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