toga 0.0.1 → 0.0.2

data/README.md

@@ -12,6 +12,7 @@ Toga is a rubygem.
 
 ## Usage
 
+	$ toga init .
 	$ mate Togafile
 	
 	

data/Togafile

@@ -1,17 +1,12 @@
 CURRENT
 
-Regularly clean up whitespace in Togafile
-Synchronize how docs refer to "complete" with the codebase
+Add dashes in front of tasks on strip
+Handle misspelled tasks
 
-Add later command and current command.
 LATER
 
-
 Append timestamps on complete
 Append commit logs on push
-
-
-
 Add later
 
 MAYBE
@@ -20,11 +15,13 @@ Import previous git commit messages and put into completed group, so that toga i
 Scan for @todos in project and create `later` tasks for them
 Support multiline tasks (kind of don't want to)
 
-
-
 COMPLETED
+
+Ensure completed task moves to completed group
+Prepend completed tasks instead of appending
 Make toga commit interactive
 ! If you use a random heading in your file, the system includes its tasks in the preceding group
-
-
-
+Update readme with correct init cmd.
+Add later command and current command.
+Add completed command
+Regularly clean up whitespace in Togafile

data/USAGE

@@ -7,7 +7,7 @@ Toga is a todo list for git.
       
     Examples:
       toga                  An empty command just prints this usage.
-      toga <PATH>           Creates a Togafile in that directory.
+      toga init <PATH>      Creates a Togafile in that directory and adds the Togafile to your .gitignore.
       toga list <GROUP>	    Prints the task list. Optionally, print a specific list by name.
       toga edit             Opens up the Togafile in your local editor.
       toga ignore           .gitignores your Togafile

data/lib/toga/commands/add.rb

@@ -4,7 +4,7 @@ module Toga
       
       def self.run!(*args)
         Togafile.append_to_group :current, args.join(' ')
-        Togafile.lines_in_group :current
+        puts Togafile.lines_in_group :current
       end
     end
   end

data/lib/toga/commands/commit.rb

@@ -26,7 +26,9 @@ module Toga
         files_to_add = '.'
         if untracked.count > 0 || modified.count > 0 || added.count == 0
           if untracked.count > 0
+            files_to_add = [] if files_to_add.is_a? String
             puts error("You didn't add the following files:\n")
+            files_to_add.concat untracked
             puts untracked.join("\n") + "\n\n"
           end
           
@@ -37,7 +39,8 @@ module Toga
           
           if added.count == 0
             changed = git.status.changed.keys
-            files_to_add = changed
+            files_to_add = [] if files_to_add.is_a? String
+            files_to_add.concat changed
             puts error("The following files are modified, but their changes aren't added:\n")
             puts changed.join("\n") + "\n\n"
           end

data/lib/toga/commands/complete.rb

@@ -3,8 +3,8 @@ module Toga
     class Complete < Command
       
       def self.run!(*args)
-        prefix = args.join(' ')
-        Togafile.move prefix, :current => :completed
+        prefix = args.join(' ').strip
+        Togafile.move prefix, {:current => :completed}, {prepend: true}
       end
     end
   end

data/lib/toga/commands/completed.rb

@@ -0,0 +1,10 @@
+module Toga
+  module Commands
+    class Completed < Command
+      
+      def self.run!(*args)
+        puts Commands::List.run! [:completed]
+      end
+    end
+  end
+end

data/lib/toga/commands/init.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'git'
 
 module Toga
   module Commands
@@ -12,9 +13,25 @@ module Toga
         FileUtils.mkdir_p dir if !File.directory?(dir)
         
         # Copies the Togafile scaffold to the new Togafile
-        File.open(File.expand_path(File.join(dir, Toga::TOGAFILE_NAME)), 'w') do |f|
-          togafile = File.expand_path(File.join(Toga::SCAFFOLD_PATH, Toga::TOGAFILE_NAME))
-          f.write File.open(togafile).read
+        new_togafile = File.expand_path(File.join(dir, Toga::TOGAFILE_NAME))
+        unless File.exists?(new_togafile)
+          File.open(new_togafile, 'w') do |f|
+            togafile = File.expand_path(File.join(Toga::SCAFFOLD_PATH, Toga::TOGAFILE_NAME))
+            f.write File.open(togafile).read
+          end
+        end
+        
+        # Add togafile to the .gitignore.
+        begin
+          git = Git.open(File.expand_path(File.join(dir)))
+          if !git.status.ignored.keys.include?(Toga::TOGAFILE_NAME)
+          
+            File.open(File.expand_path(File.join(dir, '.gitignore')), 'a') do |f|
+              f.write Toga::TOGAFILE_NAME
+            end
+          end
+        rescue
+          puts "Couldn't find .gitignore, so Togafile won't be ignored by git."
         end
         
         "Created #{Toga::TOGAFILE_NAME} in #{dir}."

data/lib/toga/commands/strip.rb

@@ -0,0 +1,10 @@
+module Toga
+  module Commands
+    class Strip < Command
+      
+      def self.run!(*args)
+        Togafile.strip!
+      end
+    end
+  end
+end

data/lib/toga/togafile.rb

@@ -28,18 +28,23 @@ module Toga
       end
     
       def append_to_group(group_name, string)
+        strip!
+        
         lines = self.to_a
         range = group_range(group_name)
         last_index = range.last
         
         # Insert string at the end of the group
-        lines.insert(last_index+1, string)
+        last_index += 1 if lines[last_index].strip != ""
+        lines.insert(last_index, string)
         
         # Write array back to file
         overwrite(lines)
       end
       
       def prepend_to_group(group_name, string)
+        strip!
+        
         lines = self.to_a
         range = group_range(group_name)
         first_index = range.first + 1 # Add one to bypass title
@@ -71,7 +76,7 @@ module Toga
         full
       end
       
-      def move(prefix, move_hash)
+      def move(prefix, move_hash, options)
         from  = move_hash.keys.first
         to    = move_hash.values.first
         if !lines_in_group(from).includes_prefix?(prefix)
@@ -79,7 +84,11 @@ module Toga
         end
         
         full = self.remove_from_group(from, prefix)
-        self.append_to_group(to, full)
+        if options[:prepend]
+          self.prepend_to_group(to, full)
+        else
+          self.append_to_group(to, full)
+        end          
       end
       
       def search(prefix)
@@ -144,6 +153,37 @@ module Toga
         group
       end
       
+      # Cleans all the whitespace in the file.
+      def strip!
+        lines = self.to_a
+        line_after_heading = false
+        in_group = ""
+        copy = []
+        lines.each_with_index do |line, i|
+          if line_after_heading == true
+            # Insert a blank line before the start of a group
+            copy << ""
+            
+            line_after_heading = false
+          end
+          
+          unless line == ""
+            # Copy the line
+            copy << line
+          end
+          
+          in_group = line.match(HEADING_REGEX)
+          if in_group
+            # Insert a blank line after the end of a group
+            copy.insert copy.length-1, "" unless i == 0
+            line_after_heading = true
+          end
+          
+        end
+        
+        overwrite(copy)
+      end
+      
       def overwrite(lines)
         handle = file_handle('w')
         lines.each {|l| handle.puts(l) }

data/lib/toga/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toga
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70286308535840 !ruby/object:Gem::Requirement
+  requirement: &70366277590620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70286308535840
+  version_requirements: *70366277590620
 - !ruby/object:Gem::Dependency
   name: require_relative
-  requirement: &70286308535240 !ruby/object:Gem::Requirement
+  requirement: &70366277590120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286308535240
+  version_requirements: *70366277590120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70286308534640 !ruby/object:Gem::Requirement
+  requirement: &70366277589620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286308534640
+  version_requirements: *70366277589620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70286308533960 !ruby/object:Gem::Requirement
+  requirement: &70366277589200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286308533960
+  version_requirements: *70366277589200
 description: a todo list that integrates seamlessly with git
 email:
 - me@colinyoung.com
@@ -76,6 +76,7 @@ files:
 - lib/toga/commands/add.rb
 - lib/toga/commands/commit.rb
 - lib/toga/commands/complete.rb
+- lib/toga/commands/completed.rb
 - lib/toga/commands/current.rb
 - lib/toga/commands/init.rb
 - lib/toga/commands/later.rb
@@ -83,6 +84,7 @@ files:
 - lib/toga/commands/now.rb
 - lib/toga/commands/remove.rb
 - lib/toga/commands/rm.rb
+- lib/toga/commands/strip.rb
 - lib/toga/commands/top.rb
 - lib/toga/commands/uncomplete.rb
 - lib/toga/error.rb