snipper 0.0.2 → 0.0.3

data/bin/snipper

@@ -1,32 +1,65 @@
 #!/usr/bin/ruby
 
+require 'rubygems'
 require 'snipper'
+require 'thor'
 
-@options = {:command     => "new"}
+class MyCLI<Thor
+  desc "add [FILE1..5]", "add a snippet"
+  long_desc <<-D
+  There are various ways to add a new snippet:
 
-OptionParser.new do |opts|
-  opts.on("--lang LANGUAGE", "-l", "Snippet Language") do |v|
-    @options[:syntax] = v
+  To add a number of PHP files to a single snippet:
+
+  $ snipper add file1 file2 file3 file4 file5 --lang=php
+
+  To create a new snippet with a file from STDIN:
+
+  $ cat files1 | snipper add --lang=php
+
+  There is also a shortcut for supplying files from STDIN:
+
+  $ cat file1 | snipper --lang=php
+  D
+  option :syntax, :desc => "Language to use for the new snippet", :default => "ruby", :type => :string, :aliases => ["-l", "--lang", "-s"]
+  def add(file1=nil, file2=nil, file3=nil, file4=nil, file5=nil)
+    puts Snipper::Util.new([file1, file2, file3, file4, file5].compact, options[:syntax])
+  end
+
+  desc "append [SNIPPET] [FILE1..5]", "appends a file to an existing snippet"
+  long_desc <<-D
+  Appending works similar to adding except you must known an existing snippet number:
+
+  $ snipper append 123 file1 file2 file3 file4 file5 --lang=php
+
+  $ cat file1 | snipper append 123 --lang=php
+  D
+  option :syntax, :desc => "Language to use for the new snippet", :default => "ruby", :type => :string, :aliases => ["-l", "--lang", "-s"]
+  def append(snippet, file1=nil, file2=nil, file3=nil, file4=nil, file5=nil)
+    puts Snipper::Util.append(snippet, [file1, file2, file3, file4, file5].compact, options[:syntax])
   end
 
-  opts.on("-L","List Languages") do
-    @options[:list] = true
+  desc "delete [SNIPPET]", "deletes an existing snippet"
+  def delete(snippet)
+    Snipper::Util.delete(snippet)
   end
-end.parse!
-
-exec "pygmentize -L lexer" if @options[:list]
-
-@options[:command] = ARGV[0] if ARGV.size >= 1
-
-case @options[:command]
-  when "search", "s"
-    Snipper::Command::Search.new(@options)
-  when "delete", "d", "rm"
-    Snipper::Command::Delete.new(@options)
-  when "view", "v"
-    Snipper::Command::View.new(@options)
-  when "edit", "e"
-    puts Snipper::Command::Edit.new(@options).url
-  else
-    puts Snipper::Command::New.new(@options).url
+
+  desc "edit [SNIPPET]", "edits an existing snippet"
+  def edit(snippet)
+    puts Snipper::Util.edit(snippet)
+  end
+
+  desc "view [SNIPPET]", "views an existing snippet"
+  def view(snippet)
+    puts Snipper::Util.view(snippet)
+  end
+
+  desc "languages", "list known languages"
+  def languages
+    Snipper::Util.list_langs
+  end
+
+  default_task :add
 end
+
+MyCLI.start(ARGV)

data/lib/snipper.rb

@@ -3,12 +3,8 @@ require 'pygments.rb'
 require 'optparse'
 require 'etc'
 require 'snipper/config'
+require 'snipper/util'
 require 'snipper/snippet'
-require 'snipper/command/new'
-require 'snipper/command/edit'
-require 'snipper/command/delete'
-require 'snipper/command/search'
-require 'snipper/command/view'
 require 'snipper/version'
 require 'snipper/output/pygments_output.rb'
 require 'yaml'

data/lib/snipper/output/pygments_output.rb

@@ -27,9 +27,9 @@ class Snipper
           html.puts ".linenos { text-align: right; color: white; width: 30px; }"
 
           if Config[:dark_theme]
-            html.puts ".highlight { background-color: #0C1000 }"
+            html.puts ".highlight { background-color: #0C1000; color: white }"
           else
-            html.puts ".highlight { background-color: white }"
+            html.puts ".highlight { background-color: white; color: black }"
           end
 
           html.puts "</style>"

data/lib/snipper/util.rb

@@ -0,0 +1,92 @@
+class Snipper
+  class Util
+    def self.delete(snippet)
+      snipper = Snipper.new
+
+      raise "Please specify a snippet number" unless snippet =~ /^\d+$/
+
+      snip = Snippet.new(nil, :snippet => snippet)
+
+      snip.delete!
+    end
+
+    def self.new(snippet, syntax)
+      snipper = Snipper.new
+
+      if STDIN.tty?
+        if snippet.empty?
+          if ARGV.empty?
+            abort "When adding a snippet without providing any arguments a snippet has to be provided on STDIN, run 'snipper help add' for full details"
+          else
+            abort "Please specify a filename or provide a snippet on STDIN"
+          end
+        end
+
+        txt = snippet
+      else
+        txt = STDIN.read
+      end
+
+      snip = Snippet.new(txt, {:syntax => syntax})
+      snip.url_for_snippet
+    end
+
+    def self.append(snippet_id, snippet, syntax)
+      snipper = Snipper.new
+
+      if STDIN.tty?
+        abort "Please specify a filename or provide a snippet on STDIN" if snippet.empty?
+
+        txt = snippet
+      else
+        txt = STDIN.read
+      end
+
+      snip = Snippet.new(txt, {:syntax => syntax, :snippet => snippet_id})
+      snip.url_for_snippet
+    end
+
+    def self.edit(snippet)
+      snipper = Snipper.new
+
+      raise "Please specify a snippet number" unless snippet
+
+      snip = Snippet.new(nil, :snippet => snippet)
+
+      files = snip.files.map {|file| File.join(snip.snippet_path, file)}
+
+      editor = ENV["EDITOR"] || "vi"
+
+      system "%s %s" % [editor, files.join(" ")]
+
+      files.each do |file|
+        unless File.size?(file)
+          puts "Removing #{file} from the snippet"
+          File.unlink(file)
+        end
+      end
+
+      snip.update_html
+
+      snip.url_for_snippet
+    end
+
+    def self.view(snippet)
+      snipper = Snipper.new
+
+      snip = Snippet.new(nil, :snippet => snippet)
+
+      files = snip.files.map {|file| File.join(snip.snippet_path, file)}
+
+      pager = ENV["PAGER"] || "less"
+
+      system "cat %s|%s" % [files.join(" "), pager]
+
+      snip.url_for_snippet
+    end
+
+    def self.list_langs
+      exec "pygmentize -L lexer"
+    end
+  end
+end

data/lib/snipper/version.rb

@@ -1,3 +1,3 @@
 class Snipper
-  VERSION="0.0.2"
+  VERSION="0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: snipper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-28 00:00:00 +01:00
+date: 2012-05-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: A Unix CLI centric snippet manager that produces static files
 email: rip@devco.net
 executables: 
@@ -74,11 +88,7 @@ files:
 - lib/snipper/config.rb
 - lib/snipper/output/pygments_output.rb
 - lib/snipper/version.rb
-- lib/snipper/command/delete.rb
-- lib/snipper/command/edit.rb
-- lib/snipper/command/new.rb
-- lib/snipper/command/search.rb
-- lib/snipper/command/view.rb
+- lib/snipper/util.rb
 - lib/snipper.rb
 has_rdoc: true
 homepage: http://devco.net/

data/lib/snipper/command/delete.rb

@@ -1,21 +0,0 @@
-class Snipper
-  class Command
-    class Delete
-      attr_reader :url, :snippet
-
-      def initialize(options)
-        @options = options
-
-        snipper = Snipper.new
-
-        raise "Please specify a snippet number" unless ARGV[1] =~ /^\d+$/
-
-        options[:snippet] = ARGV[1]
-
-        snippet = Snippet.new(nil, @options)
-
-        snippet.delete!
-      end
-    end
-  end
-end

data/lib/snipper/command/edit.rb

@@ -1,35 +0,0 @@
-class Snipper
-  class Command
-    class Edit
-      attr_reader :url, :snippet
-
-      def initialize(options)
-        @options = options
-
-        snipper = Snipper.new
-
-        raise "Please specify a snippet number" unless ARGV[1] =~ /^\d+$/
-
-        options[:snippet] = ARGV[1]
-
-        snippet = Snippet.new(nil, @options)
-        @url = snippet.url_for_snippet
-
-        files = snippet.files.map {|file| File.join(snippet.snippet_path, file)}
-
-        editor = ENV["EDITOR"] || "vi"
-
-        system "%s %s" % [editor, files.join(" ")]
-
-        files.each do |file|
-          unless File.size?(file)
-            puts "Removing #{file} from the snippet"
-            File.unlink(file)
-          end
-        end
-
-        snippet.update_html
-      end
-    end
-  end
-end

data/lib/snipper/command/new.rb

@@ -1,30 +0,0 @@
-class Snipper
-  class Command
-    class New
-      attr_reader :url, :snippet
-
-      def initialize(options)
-        @options = options
-
-        @snipper = Snipper.new
-
-        # if the first arg is a number and it isnt a file path
-        # then assume this is a snippet id we want to append to
-        if ARGV.first =~ /^\d+$/ && !File.exist?(ARGV.first)
-          options[:snippet] = ARGV.shift
-        end
-
-        if STDIN.tty?
-          abort "Please specify a filename or provide one on STDIN" if ARGV.empty?
-
-          txt = ARGV
-        else
-          txt = STDIN.read
-        end
-
-        @snippet = Snippet.new(txt, @options)
-        @url = @snippet.url_for_snippet
-      end
-    end
-  end
-end

data/lib/snipper/command/search.rb

@@ -1,21 +0,0 @@
-class Snipper
-  class Command
-    class Search
-      attr_reader :url, :snippet
-
-      def initialize(options)
-        @options = options
-
-        snipper = Snipper.new
-
-        raise "Please specify a search string" unless ARGV[1]
-
-        Dir.chdir(Config[:snippets_dir]) do
-          grep = Config[:grep].gsub("%Q%", ARGV[1].gsub("'", "\\'"))
-
-          system grep
-        end
-      end
-    end
-  end
-end

data/lib/snipper/command/view.rb

@@ -1,25 +0,0 @@
-class Snipper
-  class Command
-    class View
-      attr_reader :url, :snippet
-
-      def initialize(options)
-        @options = options
-
-        snipper = Snipper.new
-
-        raise "Please specify a snippet number" unless ARGV[1] =~ /^\d+$/
-
-        options[:snippet] = ARGV[1]
-
-        snippet = Snippet.new(nil, @options)
-
-        files = snippet.files.map {|file| File.join(snippet.snippet_path, file)}
-
-        pager = ENV["PAGER"] || "less"
-
-        system "cat %s|%s" % [files.join(" "), pager]
-      end
-    end
-  end
-end