fundler 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd396afe86ce80e1f88e81b56a12f30b81e07aa
-  data.tar.gz: 4d2eb9f303f0d4e6bae095e603e6d3d98339b2ae
+  metadata.gz: bfbaef5181cc209495603196eb1bb6970cf630b8
+  data.tar.gz: 15497ddc1d211b92cdffc27ea2c710c943c32db3
 SHA512:
-  metadata.gz: 1f1b195a5f4b970646708c0fd9d03e96a42252b60522a72544c67a053edcf0bf38cc2769be88d338ab3787eda00d00f8dbb79fe4fa9a5925d71cff83487dbe83
-  data.tar.gz: 0360ce610247f9e54ad3c2a2a955ba08e3e1f911739ad2382002f87d576550e31ea6c286c210bfe436ded229e8b09175d2e81ccdfaa214e3a1eb55c5e7d8f0f8
+  metadata.gz: daf98e3b3b63085f0b322eed6fbc1ea3ef5aacfa8c09cc654d2849fb8ef1f63958fc01337b729964e5cd379b481e9f2014931d000171632b3e2b8d21aab1e97e
+  data.tar.gz: 76d0b5f55c5b51a6347ed61aeacff401727de1903550c3ac4f2780b3048ed944d02861ae61b9f82f4b6225d59142e5548ce1af8750e9a7a3336d861df137559d

data/README.md

@@ -6,7 +6,7 @@ TODO: Write a gem description
 
 Add this line to your application's Gemfile:
 
-    gem 'findler'
+    gem 'fundler'
 
 And then execute:
 
@@ -14,12 +14,21 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install findler
+    $ gem install fundler
 
 ## Usage
 
 TODO: Write usage instructions here
 
+```
+
+$ fundler -h
+$ fundler -c
+$ fundler -b
+
+
+```
+
 ## Contributing
 
 1. Fork it

data/lib/fundler/bookmarks_reader.rb

@@ -0,0 +1,90 @@
+# coding: utf-8
+
+module BookmarksReader
+
+=begin rdoc
+
+== Schema
+http://people.mozilla.org/~dietrich/places-erd.png
+
+== References
+http://stackoverflow.com/questions/464516/firefox-bookmarks-sqlite-structure
+https://developer.mozilla.org/en-US/docs/Places
+https://developer.mozilla.org/en-US/docs/Retrieving_part_of_the_bookmarks_tree
+https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsINavBookmarksService
+http://davidkoepi.wordpress.com/2010/11/27/firefoxforensics/
+
+== Queries
+sqlite> select moz_places.url, moz_bookmarks.title from moz_places,moz_bookmarks where moz_places.id = moz_bookmarks.fk and moz_bookmarks.title != '';
+sqlite> select keyword,url from moz_keywords left join moz_bookmarks on (moz_keywords.id = keyword_id) left join moz_places on (fk = moz_places.id);
+sqlite> select moz_places.url, datetime((moz_historyvisits.visit_date/1000000), ‘unixepoch’, ‘localtime’), moz_historyvisits.visit_type from moz_places, moz_historyvisits where moz_historyvisits.place_id = moz_places.id order by moz_historyvisits.visit_date desc;
+=end
+
+  MOZILLA_FIREFOX_CONF_DIR = File.expand_path('~') + '/.mozilla/firefox/'
+  # BOOKMARKS_QUERY = %q{select moz_places.url, moz_bookmarks.title from moz_places, moz_bookmarks where moz_places.id = moz_bookmarks.fk and moz_bookmarks.title != '';}
+  BOOKMARKS_QUERY = <<-SQL
+SELECT DISTINCT
+    moz_places.url AS url,
+    moz_bookmarks.title AS title,
+    moz_items_annos.content AS description
+
+FROM
+    moz_places,
+    moz_bookmarks,
+    moz_items_annos,
+    moz_anno_attributes
+
+WHERE
+    moz_anno_attributes.name = 'bookmarkProperties/description'
+    AND moz_items_annos.anno_attribute_id = moz_anno_attributes.id
+    AND moz_items_annos.item_id = moz_bookmarks.id
+    AND moz_places.id = moz_bookmarks.fk
+    AND moz_places.id IN (
+            SELECT DISTINCT fk FROM moz_bookmarks
+            WHERE parent IN (
+                SELECT moz_bookmarks.id
+                FROM moz_bookmarks, moz_bookmarks_roots
+                WHERE moz_bookmarks_roots.root_name = 'tags'
+                AND moz_bookmarks.parent = moz_bookmarks_roots.folder_id
+            )
+        )
+        
+ORDER BY UPPER(moz_bookmarks.title) ASC
+  SQL
+  
+  # +drop_bookmarks+ browse the home directory of the current user,
+  # locate the +places.sqlite+ db_file generated by Firefox and
+  # retrieve all the bookmarks stored.
+  def drop_bookmarks(format = :plain)
+    require 'sqlite3'
+    db = SQLite3::Database.new(locate_places)
+    db.execute(BOOKMARKS_QUERY) do |row|
+      case format
+      when :plain
+        puts row
+        puts '---'
+      when :html
+        puts "TODO"
+      when :markdown
+        puts "TODO"
+      end
+    end  
+  end
+  
+  def locate_places
+    begin
+      dot_firefox = Dir.open(MOZILLA_FIREFOX_CONF_DIR)
+      profile_dir = dot_firefox.select {|dir| dir =~ /.*default/}
+      db_file = MOZILLA_FIREFOX_CONF_DIR + profile_dir.join + '/places.sqlite'
+    rescue Errno::ENOENT
+      puts "no db_bookmarks found"
+      exit 1
+    end
+  end
+  
+  def dump_places
+    FileUtils.cp(locate_places, pwd)
+  end
+  
+end # BookmarksReader
+

data/lib/fundler/find_and_clean.rb

@@ -52,68 +52,6 @@ module FindAndClean
     end
     puts out
   end
-  
-=begin rdoc
-
-== Schema
-http://people.mozilla.org/~dietrich/places-erd.png
-
-== References
-http://stackoverflow.com/questions/464516/firefox-bookmarks-sqlite-structure
-https://developer.mozilla.org/en-US/docs/Places
-https://developer.mozilla.org/en-US/docs/Retrieving_part_of_the_bookmarks_tree
-https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsINavBookmarksService
-http://davidkoepi.wordpress.com/2010/11/27/firefoxforensics/
-
-== Queries
-sqlite> select moz_places.url, moz_bookmarks.title from moz_places,moz_bookmarks where moz_places.id = moz_bookmarks.fk and moz_bookmarks.title != '';
-sqlite> select keyword,url from moz_keywords left join moz_bookmarks on (moz_keywords.id = keyword_id) left join moz_places on (fk = moz_places.id);
-sqlite> select moz_places.url, datetime((moz_historyvisits.visit_date/1000000), ‘unixepoch’, ‘localtime’), moz_historyvisits.visit_type from moz_places, moz_historyvisits where moz_historyvisits.place_id = moz_places.id order by moz_historyvisits.visit_date desc;
-=end
-
-  MOZILLA_FIREFOX_CONF_DIR = File.expand_path('~') + '/.mozilla/firefox/'
-  # BOOKMARKS_QUERY = %q{select moz_places.url, moz_bookmarks.title from moz_places, moz_bookmarks where moz_places.id = moz_bookmarks.fk and moz_bookmarks.title != '';}
-  BOOKMARKS_QUERY = <<-SQL
-SELECT DISTINCT
-    moz_places.url AS url,
-    moz_bookmarks.title AS title,
-    moz_items_annos.content AS description
-
-FROM
-    moz_places,
-    moz_bookmarks,
-    moz_items_annos,
-    moz_anno_attributes
-
-WHERE
-    moz_anno_attributes.name = 'bookmarkProperties/description'
-    AND moz_items_annos.anno_attribute_id = moz_anno_attributes.id
-    AND moz_items_annos.item_id = moz_bookmarks.id
-    AND moz_places.id = moz_bookmarks.fk
-    AND moz_places.id IN (
-            SELECT DISTINCT fk FROM moz_bookmarks
-            WHERE parent IN (
-                SELECT moz_bookmarks.id
-                FROM moz_bookmarks, moz_bookmarks_roots
-                WHERE moz_bookmarks_roots.root_name = 'tags'
-                AND moz_bookmarks.parent = moz_bookmarks_roots.folder_id
-            )
-        )
-        
-ORDER BY UPPER(moz_bookmarks.title) ASC
-  SQL
-  def drop_bookmarks
-    dot_firefox = Dir.open(MOZILLA_FIREFOX_CONF_DIR)
-    profile_dir = dot_firefox.select {|dir| dir =~ /.*default/}
-    db_file = MOZILLA_FIREFOX_CONF_DIR + profile_dir.join + '/places.sqlite'
-    require 'sqlite3'
-    db = SQLite3::Database.new(db_file)
-    db.execute(BOOKMARKS_QUERY) do |row|
-      puts row
-      puts '---'
-    end
-    FileUtils.cp(db_file, pwd)
-  end
 
 end #FindAndClean
 

data/lib/fundler/fundler_utils.rb

@@ -3,6 +3,28 @@
 require 'fileutils'
 require 'rspec'
 
+class String
+
+  def squish
+    dup.squish!
+  end
+
+  def squish!
+    strip!
+    gsub!(/\s+/, ' ')
+    self
+  end
+
+end
+
+module FundlerUtils
+
+  def self.included(base)
+    # ...
+  end
+
+end
+
 module ExitCodeMatchers
   RSpec::Matchers.define :exit_with_code do |code|
     actual = nil

data/lib/fundler/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 class Fundler
   # The version of the Fundler Utility.
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/fundler.rb

@@ -1,8 +1,12 @@
 require 'fundler/find_and_clean'
-require 'fileutils'
+require 'fundler/bookmarks_reader'
+require 'fundler/fundler_utils'
+require 'fundler/version'
 
 class Fundler
   include FindAndClean
+  include BookmarksReader
+  include FundlerUtils
   def clean
     clean_all_filenames
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fundler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - zeroed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,12 +54,12 @@ files:
 - bin/fundler
 - fundler.gemspec
 - lib/fundler.rb
+- lib/fundler/bookmarks_reader.rb
 - lib/fundler/find_and_clean.rb
 - lib/fundler/fundler_utils.rb
 - lib/fundler/version.rb
 - places.sqlite
 - spec/fundler_spec.rb
-- spec/fundler_spec.rb~
 homepage: https://github.com/zeroed/fundler
 licenses:
 - GPL3
@@ -86,5 +86,4 @@ specification_version: 4
 summary: find rename utility
 test_files:
 - spec/fundler_spec.rb
-- spec/fundler_spec.rb~
 has_rdoc: 

data/spec/fundler_spec.rb~

@@ -1,70 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'fundler'
-require 'fundler/findler_utils'
-
-RSpec.configure do |config|
-  config.filter_run_excluding ruby: ->(v) { !RUBY_VERSION.start_with?(v.to_s) }
-  config.color_enabled = true
-  config.formatter = 'documentation'
-  # https://github.com/rspec/rspec-expectations
-  config.expect_with :rspec do |c|
-    c.syntax = :expect # disables `should`
-  end
-
-  config.include(ExitCodeMatchers)
-end
-
-class TestFundler
-  describe Fundler do
-    let(:finder) { Fundler.new }
-    before(:each) do
-      FileUtils::mkdir 'test'
-      File.open('test/example', 'w') do |f|
-        f.puts '#!/usr/bin/env ruby'
-        f.puts '# encoding: utf-8'
-        f.puts 'x = 0'
-        f.puts 'puts x'
-      end
-      File.open('test/example_rb.rb', 'w') do |f|
-        f.puts 'x = :foo'
-        f.puts 'puts x'
-      end
-      File.open('test/list.txt', 'w') do |f|
-        f.puts 'grocery list'
-        f.puts '- chunky bacon'
-      end
-      File.open('test/SpAcE  cAmEl.txt', 'w') do |f|
-        f.puts 'foo!'
-      end
-    end
-    after(:each) do
-      FileUtils::rm_rf 'test'
-    end
-  
-    it 'finds all files' do
-      FileUtils::cd './test' do
-        expect(finder.all_files()).to eq(['example', 'example_rb.rb', 'list.txt', 'SpAcE  cAmEl.txt'].sort)
-      end
-    end
-    it 'finds a file with no .rb extension but has a shebang line' do
-      FileUtils::cd './test' do
-        expect(finder.ruby_files()).to eq(['example', 'example_rb.rb'])
-      end
-    end
-    it 'clean all filenames' do
-      FileUtils::cd './test' do
-        expect(finder.clean_all_filenames()).to eq(4)
-        expect(finder.all_files()).to eq(['example', 'example_rb.rb', 'list.txt', 'space_camel.txt'].sort)
-      end
-    end
-    it 'show the pwd (last dir in this spec)' do
-      FileUtils::cd './test' do
-        expect(finder.get_pwd.split('/').last).to eq('test')
-      end
-    end
-
-  end # describe
-  
-end #TestFundler