do_stuff 0.0.1 → 0.1.0

data/bin/do_stuff

@@ -1,59 +1,4 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'fileutils'
-require 'optparse'
 require 'do_stuff'
 
-DO_STUFFRC = ENV['HOME'] + '/.do_stuffrc'
-abort "Error: Couldn't find #{DO_STUFFRC}.\nPlease create it and put the " +
-  "path to your todo.txt file in it." unless File.exists?(DO_STUFFRC)
-
-TODO_FILE = File.expand_path(File.read(DO_STUFFRC).chomp)
-FileUtils.mkdir_p(File.dirname(TODO_FILE))
-FileUtils.touch(TODO_FILE)
-
-program = File.basename($0)
-USAGE = <<EOS
-usage: #{program}               list unfinished tasks
-       #{program} <task desc>   add a new task
-       #{program} <task num>    erase task
-       #{program} -e[task num]  edit task file and jump to given task
-       #{program} -h            show this message
-EOS
-
-OptionParser.new do |opts|
-  opts.on('-e [TASK NUM]') do |task_num|
-    TodoList.edit(TODO_FILE)
-    exit
-  end
-
-  opts.on('-h', '--help') do
-    puts USAGE
-    exit
-  end
-end.parse!
-
-begin
-  todolist = TodoList.new(TODO_FILE)
-rescue TodoList::ParseError => e
-  abort "Error parsing #{e.file}: #{e.message}"
-end
-
-if ARGV.length == 0
-  todolist.tasks.each do |num, task|
-    puts "#{num}. #{task}"
-  end
-elsif ARGV.length == 1 && ARGV[0] =~ /^\d+$/
-  task_num = ARGV[0].to_i
-  task = todolist.get(task_num)
-  abort "There is no task ##{task_num}." unless task
-  todolist.erase(task_num)
-  todolist.write!
-  puts "Erased ##{task_num}: #{task}"
-else
-  # If nothing else matches, treat the arguments as a task description.
-  task = ARGV.join(' ')
-  task_num = todolist.add(task)
-  todolist.write!
-  puts "Added ##{task_num}: #{task}"
-end
+DoStuff::Runner.execute(*ARGV)

data/lib/do_stuff/runner.rb

@@ -0,0 +1,88 @@
+require 'fileutils'
+require 'optparse'
+
+module DoStuff
+  module Runner
+    def self.execute(*argv)
+      dostuffrc = ENV['HOME'] + '/.do_stuffrc'
+      abort "Error: Couldn't find #{dostuffrc}.\nPlease create it and put " +
+        "the path to your todo.txt file in it." unless File.exists?(dostuffrc)
+
+      todofile = File.expand_path(File.read(dostuffrc).chomp)
+      FileUtils.mkdir_p(File.dirname(todofile))
+      FileUtils.touch(todofile)
+
+
+      opts = OptionParser.new do |opts|
+        opts.on('-e [TASK NUM]') do |task_num|
+          TodoList.edit(todofile)
+          exit
+        end
+
+        opts.on('--standalone FILE') do |file|
+          if defined?(::DoStuff::Standalone)
+            Standalone.save(file)
+            puts "#{file} generated successfully! Have fun doing stuff."
+            exit
+          else
+            abort "You're already using a standalone do_stuff script."
+          end
+        end
+
+        opts.on('-h', '--help') do
+          usage
+          exit
+        end
+      end
+
+      begin
+        opts.parse!(argv)
+      rescue OptionParser::ParseError => e
+        abort e.message
+      end
+
+      begin
+        todolist = TodoList.new(todofile)
+      rescue TodoList::ParseError => e
+        abort "Error parsing #{e.file}: #{e.message}"
+      end
+
+      if argv.length == 0
+        todolist.tasks.each do |num, task|
+          puts "#{num}. #{task}"
+        end
+      elsif argv.length == 1 && argv[0] =~ /^\d+$/
+        task_num = argv[0].to_i
+        task = todolist.get(task_num)
+        abort "There is no task ##{task_num}." unless task
+        todolist.erase(task_num)
+        todolist.write!
+        puts "Erased ##{task_num}: #{task}"
+      else
+        # If nothing else matches, treat the arguments as a task description.
+        task = argv.join(' ')
+        task_num = todolist.add(task)
+        todolist.write!
+        puts "Added ##{task_num}: #{task}"
+      end
+    end
+
+    def self.usage
+      program = File.basename($0)
+
+      print <<-EOS
+usage: #{program}                    list unfinished tasks
+       #{program} <task desc>        add a new task
+       #{program} <task num>         erase task
+       #{program} -e[task num]       edit task file and jump to given task
+       #{program} -h, --help         show this message
+      EOS
+
+      if defined?(::DoStuff::Standalone)
+        print <<-EOS
+       #{program} --standalone FILE  generate a standalone version of do_stuff
+        EOS
+      end
+    end
+  end
+end

data/lib/do_stuff/standalone.rb

@@ -0,0 +1,58 @@
+# This standalone script generator was shamelessly stolen from defunkt's "hub"
+# script at https://github.com/defunkt/hub. Thanks!
+
+module DoStuff
+  module Standalone
+    extend self
+
+    RUBY_BIN = if File.executable? '/usr/bin/ruby'
+                 '/usr/bin/ruby'
+               else
+                 require 'rbconfig'
+                 File.join RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']
+               end
+
+    PREAMBLE = <<-preamble
+#!#{RUBY_BIN}
+#
+# This file is generated code.
+# Please DO NOT EDIT or send patches for it.
+#
+# Please take a look at the source from
+# https://github.com/tsion/do_stuff
+# and submit patches against the individual files
+# that build do_stuff.
+#
+
+preamble
+
+    POSTAMBLE = "DoStuff::Runner.execute(*ARGV)\n"
+    __DIR__ = File.dirname(__FILE__)
+
+    def save(filename)
+      target = File.expand_path(filename)
+      File.open(target, 'w') do |f|
+        f.puts build
+        f.chmod 0755
+      end
+    end
+
+    def build
+      root = File.dirname(__FILE__)
+
+      standalone = ''
+      standalone << PREAMBLE
+
+      files = Dir["#{root}/*.rb"].sort - [__FILE__]
+
+      files.each do |file|
+        File.readlines(file).each do |line|
+          standalone << line
+        end
+      end
+
+      standalone << POSTAMBLE
+      standalone
+    end
+  end
+end

data/lib/do_stuff/todolist.rb

@@ -1,71 +1,73 @@
-class TodoList
-  def initialize(file)
-    @file = file
-    parse
-  end
+module DoStuff
+  class TodoList
+    def initialize(file)
+      @file = file
+      parse
+    end
 
-  def add(task)
-    # Try to fill a hole in the task list, otherwise append to the end.
-    i = @tasks.find_index(nil)
-    i = @tasks.length unless i
+    def add(task)
+      # Try to fill a hole in the task list, otherwise append to the end.
+      i = @tasks.find_index(nil)
+      i ||= @tasks.length
 
-    @tasks[i] = task
+      @tasks[i] = task
 
-    # Return the task number
-    i + 1
-  end
+      # Return the task number
+      i + 1
+    end
 
-  def erase(task_num)
-    raise "No such task ##{task_num}." unless @tasks[task_num - 1]
-    @tasks[task_num - 1] = nil
-  end
+    def erase(task_num)
+      raise "No such task ##{task_num}." unless @tasks[task_num - 1]
+      @tasks[task_num - 1] = nil
+    end
 
-  def get(task_num)
-    @tasks[task_num - 1]
-  end
+    def get(task_num)
+      @tasks[task_num - 1]
+    end
 
-  def tasks
-    # Group each task with its number and remove all nils
-    @tasks.map.with_index{|task, i| [i + 1, task] if task }.compact
-  end
+    def tasks
+      # Group each task with its number and remove all nils
+      @tasks.map.with_index{|task, i| [i + 1, task] if task }.compact
+    end
 
-  def write!
-    File.open(@file, 'w') do |f|
-      tasks.each{|num, task| f.puts("#{num}. #{task}") }
+    def write!
+      File.open(@file, 'w') do |f|
+        tasks.each{|num, task| f.puts("#{num}. #{task}") }
+      end
     end
-  end
 
-  def self.edit(file)
-    # TODO: Use task_num to jump to a line
-    system(ENV['EDITOR'], file)
-  end
+    def self.edit(file)
+      # TODO: Use task_num to jump to a line
+      system(ENV['EDITOR'], file)
+    end
 
-  class ParseError < StandardError
-    attr_accessor :file
-    def initialize(file, msg)
-      @file = file
-      super(msg)
+    class ParseError < StandardError
+      attr_accessor :file
+      def initialize(file, msg)
+        @file = file
+        super(msg)
+      end
     end
-  end
 
-  private
-  def parse
-    @tasks = []
+    private
+    def parse
+      @tasks = []
 
-    File.read(@file).each_line do |line|
-      line.chomp!
-      if line =~ /^(\d+)\.\s+(.+)$/
-        task_num, task = $1.to_i, $2
-        i = task_num - 1
+      File.read(@file).each_line do |line|
+        line.chomp!
+        if line =~ /^(\d+)\.\s+(.+)$/
+          task_num, task = $1.to_i, $2
+          i = task_num - 1
 
-        if @tasks[i]
-          raise ParseError.new(@file, "Two definitions for task #{task_num}:\n\t" +
-            "#{task_num}. #{@tasks[i]}\n\t#{line}")
-        end
+          if @tasks[i]
+            raise ParseError.new(@file, "Two definitions for task " +
+              "#{task_num}:\n\t#{task_num}. #{@tasks[i]}\n\t#{line}")
+          end
 
-        @tasks[i] = task
-      else
-        raise ParseError.new(@file, "Ill-formed line encountered:\n\t#{line}")
+          @tasks[i] = task
+        else
+          raise ParseError.new(@file, "Ill-formed line encountered:\n\t#{line}")
+        end
       end
     end
   end

data/lib/do_stuff.rb

@@ -1 +1,3 @@
+require 'do_stuff/standalone'
 require 'do_stuff/todolist'
+require 'do_stuff/runner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: do_stuff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies: []
 description: A minimalistic command-line todo list
 email: scott@scott-olson.org
@@ -18,6 +18,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/do_stuff/standalone.rb
+- lib/do_stuff/runner.rb
 - lib/do_stuff/todolist.rb
 - lib/do_stuff.rb
 - bin/do_stuff