booklist 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa6eb403053898f7677b45118fb2ae78fe33c6fe
-  data.tar.gz: 3c3a141cbb261f36115e67b51253ccf597534445
+  metadata.gz: 9563af51bd960512923c640e4d09d280703dcc78
+  data.tar.gz: ec4cfca402e541297d083911f8ab966df32247df
 SHA512:
-  metadata.gz: 6f765a2a23c68fefe682ccae5c9665879f4a68fc44f7a28a46961e6cb5f263e024d4f2c84ee8e180072778658ab31a1065acaa90417def68ca4aea5af3ecac97
-  data.tar.gz: f4cbc5aa0b7cac9be2f71bc174f8a0b29e8140c37ee6de592ecb5dfa45cd2c98b1be42069ab7f2fca2ca23bcf32c49f48cd3c5e029d6e1baa841a965059f5753
+  metadata.gz: 31294702b7174bcc5cb7a6a5f0917c8b1a6ed8ed7d59bf28314d46975f63e1f1c01d661b153d9fda20caa27a901e46fdce9b49e3534544a8d7924328cb521d31
+  data.tar.gz: 385d1e7333062b05f40ddc174f7e050174e02c13481bdfd1752d00b6d6102579be7eab627f6132358d7dcae0ab3096f46d5d50255fe6511d047c17a40768aca7

data/.gitignore

@@ -0,0 +1 @@
+booklist*gem

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in panoptimon.gemspec
 gemspec

data/bin/booklist

@@ -32,188 +32,132 @@ require 'pathname'
 require 'booklist'
 require 'date'
 
-module Booklist
-  options = OpenStruct.new
-  options.act_num = 0
-  usage = nil
-  OptionParser.new do |opts|
-    opts.banner = "Usage: booklist [options]"
-
-    opts.separator "Actions:"
-    opts.on("-a", "--add", "Add a book record", "(--title is required)") do
-      options.act_num += 1
-      options.action = :add
-    end
-
-    opts.on("-e", "--edit [ID]", Integer, "Edit a book record") do |id|
-      options.act_num += 1
-      options.id = id if id
-      options.action = :edit
-    end
-
-    opts.on("-d", "--delete [ID]", Integer, "Delete a book record") do |id|
-      options.act_num += 1
-      options.id = id if id
-      options.action = :delete
-    end
-
-    opts.on("-s", "--search", "Search for a book") do
-      options.act_num += 1
-      options.action = :search
-    end
-
-    opts.on("-r", "--read [ID]", Integer, "Show a book record's details") do |id|
-      options.act_num += 1
-      options.id = id if id
-      options.action = :read
-    end
-
-    opts.on("--list", "List all books in the database") do
-      options.act_num += 1
-      options.action = :list
-    end
-
-    opts.separator ""
-    opts.separator "Book details:"
-
-    # Book details
-    opts.on("--title TITLE", "Book title") do |title|
-      options.title = title
-    end
-
-    opts.on("--state STATE", "What state the book is in (read, to-read, reading, abandoned)") do |state|
-      options.state = state
-    end
-
-    opts.on("--author AUTHOR", "Book author") do |author|
-      options.author = author
-    end
-
-    opts.on("--addn_authors ADDN_AUTHORS", "Additional authors") do |aa|
-      options.addn_authors = aa
-    end
-
-    opts.on("--tags X,Y,Z", Array, "List of tags") do |tags|
-      options.tags = tags
-    end
-
-    opts.on("--date_read DATE", Date, "Date read (eg 2014-02-14)") do |dr|
-      options.date_read = dr
-    end
-
-    opts.on("--id ID", Integer, "Book ID number") do |id|
-      options.id = id
-    end
-
-    opts.separator ""
-    opts.separator "Common options:"
-
-    # TODO - configurable booklist path
-    #opts.on("-c", "--config FILE", "Use configuration file") do |file|
-    #  options.config_file = file
-    #end
-
-    opts.on("--debug", "Debug mode") do
-      options.debug = true
-    end
-
-    opts.on("--updatedb", "Update the book database schema") do
-      options.update_schema = true
-    end
-
-    opts.on_tail("--version", "Get the booklist version") do
-      puts Booklist::VERSION
-      exit
-    end
-
-    opts.on_tail("-h", "--help", "Show this message") do
-      puts opts
-      exit
-    end
-
-    usage = opts
-  end.parse!
-
-  if options.act_num > 1
-    puts "Please only use one action."
-    puts usage
+options = OpenStruct.new
+options.action = nil
+usage = nil
+OptionParser.new do |opts|
+  opts.banner = "Usage: booklist [options]"
+
+  opts.separator "Actions:"
+  opts.on("-a", "--add", "Add a book record", "(--title is required)") do
+    options.action = :add
+  end
+
+  opts.on("-e", "--edit [ID]", Integer, "Edit a book record") do |id|
+    options.id = id if id
+    options.action = :edit
+  end
+
+  opts.on("-d", "--delete [ID]", Integer, "Delete a book record") do |id|
+    options.id = id if id
+    options.action = :delete
+  end
+
+  opts.on("-s", "--search", "Search for a book") do
+    options.action = :search
+  end
+
+  opts.on("-r", "--read [ID]", Integer, "Show a book record's details") do |id|
+    options.id = id if id
+    options.action = :read
+  end
+
+  opts.on("--list", "List all books in the database") do
+    options.action = :list
+  end
+
+  opts.separator ""
+  opts.separator "Book details:"
+
+  # Book details
+  opts.on("--title TITLE", "Book title") do |title|
+    options.title = title
+  end
+
+  opts.on("--state STATE", "What state the book is in (read, to-read, reading, abandoned)") do |state|
+    options.state = state
+  end
+
+  opts.on("--author AUTHOR", "Book author") do |author|
+    options.author = author
+  end
+
+  opts.on("--addn_authors ADDN_AUTHORS", "Additional authors") do |aa|
+    options.addn_authors = aa
+  end
+
+  opts.on("--tags X,Y,Z", Array, "List of tags") do |tags|
+    options.tags = tags
+  end
+
+  opts.on("--date_read DATE", Date, "Date read (eg 2014-02-14)") do |dr|
+    options.date_read = dr
+  end
+
+  opts.on("--id ID", Integer, "Book ID number") do |id|
+    options.id = id
+  end
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  # TODO - configurable booklist path
+  #opts.on("-c", "--config FILE", "Use configuration file") do |file|
+  #  options.config_file = file
+  #end
+
+  opts.on("--debug", "Debug mode") do
+    options.debug = true
+  end
+
+  opts.on("--updatedb", "Update the book database schema") do
+    options.update_schema = true
+  end
+
+  opts.on_tail("--version", "Get the booklist version") do
+    puts Booklist::VERSION
     exit
   end
 
-  # TODO Create configuration directory if it doesn't exist
-  # mkdir ~/.booklist
-
-  # TODO configurable booklist path
-  booklist_db_path = File.join(Dir.home, '.booklist', 'booklist.db')
-
-  ActiveRecord::Base.establish_connection(
-    :adapter => 'sqlite3',
-    :database => booklist_db_path.to_s)
-  ActiveRecord::Base.logger = Logger.new(STDERR) if options.debug
-
-  if options.update_schema || !File.exist?(booklist_db_path)
-    ActiveRecord::Migrator.migrate('db/migrate')
-  end
-
-  if options.act_num = 1
-    if options.action == :add
-      if !options.title || options.title == ""
-        puts "Please add a --title with the book name"
-        puts usage
-        exit
-      end
-      book = Book.new do |b|
-        b.title = options.title
-        b.author = options.author if options.author
-        b.addn_authors = options.addn_authors if options.addn_authors
-        b.state = options.state if options.state
-        b.date_read = options.date_read if options.date_read
-        b.tag_list = options.tags if options.tags
-      end
-      book.save
-      book.cli_display
-    elsif options.action == :edit
-      book = Book.find_by(id: options.id)
-      if book
-        book.title = options.title if options.title
-        book.author = options.author if options.author
-        book.addn_authors = options.addn_authors if options.addn_authors
-        book.state = options.state if options.state
-        book.date_read = options.date_read if options.date_read
-        book.tag_list = options.tags if options.tags
-        book.save
-        book.cli_display
-      else
-        puts "No book with ID of #{options.id} was found"
-      end
-    elsif options.action == :delete
-      book = Book.find_by(id: options.id)
-      book.destroy
-    elsif options.action == :read
-      book = Book.find_by(id: options.id)
-      if book
-        book.cli_display
-      else
-        puts "No book with ID of #{options.id} was found"
-      end
-    elsif options.action == :search
-      books = []
-      books += Book.where(["title LIKE ?", "%#{options.title}%"]).to_a if options.title
-      books += Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.author}%", "%#{options.author}%"]).to_a if options.author
-      books += Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.addn_authors}%", "%#{options.addn_authors}%"]).to_a if options.addn_authors
-      books += Book.where(["state = ?", "%#{options.state}%"]).to_a if options.state
-      books.uniq!
-      books.sort!{ |a, b| a.id <=> b.id}
-      books.select!{ |b| b.state == options.state} if options.state
-      books.each { |b| b.cli_display }
-    elsif options.action == :list
-      books = Book.all
-      books.each{ |b| b.cli_display }
-    end
-  elsif options.act_num > 1
-    puts "Please only use one action."
-    puts usage
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
     exit
   end
 
+  usage = opts
+end.parse!
+
+unless options.action
+  puts "No action specified"
+  puts usage
+  exit
+end
+
+# TODO Create configuration directory if it doesn't exist
+# mkdir ~/.booklist
+
+# TODO configurable booklist path
+booklist_db_path = File.join(Dir.home, '.booklist', 'booklist.db')
+
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database => booklist_db_path.to_s)
+ActiveRecord::Base.logger = Logger.new(STDERR) if options.debug
+
+if options.update_schema || !File.exist?(booklist_db_path)
+  ActiveRecord::Migrator.migrate('db/migrate')
+end
+
+if options.action == :add
+  Booklist::add_book(options)
+elsif options.action == :edit
+  Booklist::edit_book(options)
+elsif options.action == :delete
+  Booklist::delete_book(options.id)
+elsif options.action == :read
+  Booklist::read_book(options.id)
+elsif options.action == :search
+  Booklist::search_books(options)
+elsif options.action == :list
+  Booklist.list_books
 end

data/booklist.gemspec

@@ -3,11 +3,11 @@ require File.expand_path('../lib/booklist/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "booklist"
-  gem.authors       = ["Dafydd Crosby"]
+  gem.authors       = ["David Crosby"]
   gem.description   = %q{A book collection program}
   gem.summary       = %q{Booklist helps you keep a list of books you've read or want to read.}
 
-  gem.email         = "dafydd@dafyddcrosby.com"
+  gem.email         = "dave@dafyddcrosby.com"
   gem.homepage      = "https://github.com/dafyddcrosby/booklist"
 
   gem.license       = 'bsd' # The (three-clause) BSD License

data/lib/booklist/version.rb

@@ -1,3 +1,3 @@
 module Booklist
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/lib/booklist.rb

@@ -1,3 +1,71 @@
 require 'booklist/version'
 require 'booklist/book'
 require 'booklist/tag'
+
+module Booklist
+  def self.add_book(options)
+    if !options.title || options.title == ""
+      puts "Please add a --title with the book name"
+      puts usage
+      exit
+    end
+    book = Book.new do |b|
+      b.title = options.title
+      b.author = options.author if options.author
+      b.addn_authors = options.addn_authors if options.addn_authors
+      b.state = options.state if options.state
+      b.date_read = options.date_read if options.date_read
+      b.tag_list = options.tags if options.tags
+    end
+    book.save
+    book.cli_display
+  end
+
+  def self.edit_book(options)
+    book = Book.find_by(id: options.id)
+    if book
+      book.title = options.title if options.title
+      book.author = options.author if options.author
+      book.addn_authors = options.addn_authors if options.addn_authors
+      book.state = options.state if options.state
+      book.date_read = options.date_read if options.date_read
+      book.tag_list = options.tags if options.tags
+      book.save
+      book.cli_display
+    else
+      puts "No book with ID of #{options.id} was found"
+    end
+  end
+
+  def self.read_book(id)
+    book = Book.find_by(id: id)
+    if book
+      book.cli_display
+    else
+      puts "No book with ID of #{id} was found"
+    end
+  end
+
+  def self.search_books(options)
+    books = []
+    books += Book.where(["title LIKE ?", "%#{options.title}%"]).to_a if options.title
+    books += Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.author}%", "%#{options.author}%"]).to_a if options.author
+    books += Book.where(["author LIKE ? or addn_authors LIKE ?", "%#{options.addn_authors}%", "%#{options.addn_authors}%"]).to_a if options.addn_authors
+    books += Book.where(["state = ?", "%#{options.state}%"]).to_a if options.state
+    books.uniq!
+    books.sort!{ |a, b| a.id <=> b.id}
+    books.select!{ |b| b.state == options.state} if options.state
+    books.each { |b| b.cli_display }
+  end
+
+  def self.delete_book(id)
+    book = Book.find_by(id: id)
+    book.destroy
+  end
+
+  def self.list_books
+    books =Book.all
+    books.each{ |b| b.cli_display }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booklist
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
-- Dafydd Crosby
+- David Crosby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -53,12 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A book collection program
-email: dafydd@dafyddcrosby.com
+email: dave@dafyddcrosby.com
 executables:
 - booklist
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Booklist helps you keep a list of books you've read or want to read.