sheet 0.1.5 → 0.2.0

data/README.md

@@ -36,8 +36,13 @@ automatically open a url when opening your sheet:
 url: http://example/com
 ```
 
-Make sure that's you don't have trailing lines and sheet will
-automatically open that url for you
+You can open mulitple urls at once by specifying each url in a new line.
+
+```yaml
+
+url: https://github.com/oscardelben
+url: http://example.com
+```
 
 Please note that to open urls, sheet will use the `open` command on mac
 os x and `xdg-open` in linux. Patches welcome for other systems.

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/sheet.rb

@@ -9,7 +9,7 @@ require 'sheet/copy'
 class Sheet
 
   SHEETS_DIR = '~/.sheets/'.freeze
-  
+
   class << self
     # Utility to write to standard output
     def write(message)
@@ -50,7 +50,11 @@ class Sheet
     # @return [String]
     # Used to check the preferred editor for the user
     def editor
-      exec("echo $EDITOR").chomp
+      e = exec("echo $EDITOR").chomp
+      if e == ""
+        e = exec("echo $VISUAL").chomp
+      end
+      e
     end
 
     # If we're using mac, we should use open to open urls.
@@ -75,7 +79,12 @@ class Sheet
     # Utility to check wherever a command is available in the user
     # system
     def command_available?(cmd)
-      %x!type #{cmd}!.chomp.length > 0
+      %x!type #{cmd}!.chomp.length > 0 rescue false
+    end
+
+    # Returns true if ~/.sheets exists
+    def sheets_directory_exists?
+      File.directory?(Sheet.sheets_dir)
     end
 
   end

data/lib/sheet/list.rb

@@ -3,7 +3,11 @@ class Sheet
   class List
 
     def list
-      Sheet.exec("ls #{Sheet.sheets_dir}", true)
+      if Sheet.sheets_directory_exists?
+        Sheet.exec("ls -1 #{Sheet.sheets_dir}", true)
+      else
+        Sheet.write("No sheet found. Create a new sheet with `sheet new <name>`")
+      end
     end
   end
 end

data/lib/sheet/open.rb

@@ -19,26 +19,22 @@ class Sheet
     private
 
     def process_sheet_content
-      if contains_url_format? && cmd = Sheet.open_command
-        # TODO: check if open is available
-        Sheet.exec "#{cmd} #{extract_url}"
+      if !sheet_urls.empty? && cmd = Sheet.open_command
+        sheet_urls.each do |url|
+          Sheet.exec "#{cmd} #{url.chomp.sub(/url: /,'')}"
+        end
       else
         Sheet.write sheet_content
       end
     end
 
-    def contains_url_format?
-      sheet_content.split("\n").size == 1 &&
-        sheet_content =~ /^url:\s*http.+$/
-    end
-
-    def extract_url
-      sheet_content.match(/(http.+)$/)[1]
-    end
-
     def sheet_content
       @sheet_content ||= File.read(Sheet.sheet_path(name))
     end
 
+    def sheet_urls
+      @sheet_urls ||= sheet_content.split("\n").reject {|line| line !~ /^url:/ }
+    end
+
   end
 end

data/lib/sheet/write.rb

@@ -3,11 +3,12 @@ class Sheet::Write
 
   attr_accessor :name
 
-  def initialize(name)
+  def initialize(name=nil)
     @name = name
   end
 
   def write
+    return Sheet.write("Please specify a name") unless name
     create_dir_if_doesnt_exist
     if editor_is_set?
       Sheet.exec("#{Sheet.editor} #{Sheet.sheet_path(name)}", true)
@@ -23,7 +24,7 @@ class Sheet::Write
   end
 
   def create_dir_if_doesnt_exist
-    if ! File.directory?(Sheet.sheets_dir)
+    if ! Sheet.sheets_directory_exists?
       Dir.mkdir(Sheet.sheets_dir)
     end
   end

data/sheet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sheet"
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oscar Del Ben"]
-  s.date = "2012-04-18"
+  s.date = "2012-05-01"
   s.description = "sheets allows you to store and browse snippets of text from your command line."
   s.email = "info@oscardelben.com"
   s.executables = ["sheet"]

data/spec/sheet/list_spec.rb

@@ -3,11 +3,28 @@ require 'spec_helper'
 
 describe Sheet::List do
 
-  it 'calls system ls' do
-    cmd = "ls #{Sheet.sheets_dir}"
-    Sheet.should_receive(:exec).with(cmd, true)
+  context 'when sheets directory exists' do
+    before do
+      Sheet.stub(:sheets_directory_exists?) { true }
+    end
 
-    Sheet::List.new.list
+    it 'calls system ls' do
+      cmd = "ls -1 #{Sheet.sheets_dir}"
+      Sheet.should_receive(:exec).with(cmd, true)
+
+      Sheet::List.new.list
+    end
   end
 
+  context 'when sheets directory doesn\'t exist' do
+    before do
+      Sheet.stub(:sheets_directory_exists?) { false }
+    end
+
+    it 'shows a message' do
+      Sheet.should_receive(:write).with("No sheet found. Create a new sheet with `sheet new <name>`")
+
+      Sheet::List.new.list
+    end
+  end
 end

data/spec/sheet/open_spec.rb

@@ -17,18 +17,19 @@ describe Sheet::Open do
     Sheet.stub(:sheet_exists?).with('git') { true }
     s.stub(:sheet_content) { message }
     s.open
-  end
-
-  it "should open a url" do
+  end  
+  
+  it "should open all urls" do
     Sheet.stub(:open_command) { 'open' }
-    message = "url: http://example.com"
+    message = "url: http://example.com\nurl: http://google.com"
     Sheet.should_receive(:exec).with('open http://example.com')
-
+    Sheet.should_receive(:exec).with('open http://google.com')
+ 
     s = Sheet::Open.new('git')
     Sheet.stub(:sheet_exists?).with('git') { true }
     s.stub(:sheet_content) { message }
     s.open
-  end
+  end  
 
   it "should fallback to showing the content if an open command is not present" do
     Sheet.stub(:open_command) { nil}

data/spec/sheet/write_spec.rb

@@ -4,6 +4,15 @@ describe Sheet::Write do
 
   let (:editor) { 'vim' }
 
+  before do
+    Sheet.stub(:sheets_directory_exists?) { true }
+  end
+
+  it 'shows an error message if no argument is passed' do
+    Sheet.should_receive(:write).with('Please specify a name')
+    Sheet::Write.new.write
+  end
+
   it 'opens a new file for writing' do
     cmd = "#{editor} #{Sheet.sheet_path('tmux')}"
     Sheet.should_receive(:exec).with(cmd, true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sheet
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -175941379873315490
+      hash: 2528826102062921257
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: