wlog 1.1.1 → 1.1.5

data/spec/tech/wlog_string_spec.rb

@@ -10,37 +10,37 @@ describe WlogString do
   end
 
   it 'should write in red' do
-    @str.red('').should match(/^\x1b\[#{Red}/)
-    @str.red('').should match(/\x1b\[0m$/)
+    expect(@str.red('')).to match(/^\x1b\[#{Red}/)
+    expect(@str.red('')).to match(/\x1b\[0m$/)
   end
 
   it 'should write in green' do
-    @str.green('').should match(/^\x1b\[#{Green}/)
-    @str.green('').should match(/\x1b\[0m$/)
+    expect(@str.green('')).to match(/^\x1b\[#{Green}/)
+    expect(@str.green('')).to match(/\x1b\[0m$/)
   end
 
   it 'should write in blue' do
-    @str.blue('').should match(/^\x1b\[#{Blue}/)
-    @str.blue('').should match(/\x1b\[0m$/)
+    expect(@str.blue('')).to match(/^\x1b\[#{Blue}/)
+    expect(@str.blue('')).to match(/\x1b\[0m$/)
   end
 
   it 'should write in yellow' do
-    @str.yellow('').should match(/^\x1b\[#{Yellow}/)
-    @str.yellow('').should match(/\x1b\[0m$/)
+    expect(@str.yellow('')).to match(/^\x1b\[#{Yellow}/)
+    expect(@str.yellow('')).to match(/\x1b\[0m$/)
   end
 
   it 'should write in white' do
-    @str.white('').should match(/^\x1b\[#{White}/)
-    @str.white('').should match(/\x1b\[0m$/)
+    expect(@str.white('')).to match(/^\x1b\[#{White}/)
+    expect(@str.white('')).to match(/\x1b\[0m$/)
   end
 
   it 'should write in cyan' do
-    @str.cyan('').should match(/^\x1b\[#{Cyan}/)
-    @str.cyan('').should match(/\x1b\[0m$/)
+    expect(@str.cyan('')).to match(/^\x1b\[#{Cyan}/)
+    expect(@str.cyan('')).to match(/\x1b\[0m$/)
   end
 
   it 'should write in magenta' do
-    @str.magenta('').should match(/^\x1b\[#{Magenta}/)
-    @str.magenta('').should match(/\x1b\[0m$/)
+    expect(@str.magenta('')).to match(/^\x1b\[#{Magenta}/)
+    expect(@str.magenta('')).to match(/\x1b\[0m$/)
   end
 end

data/wlog.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"
   spec.add_runtime_dependency "sqlite3", ">= 1.3.7"
-  spec.add_runtime_dependency "turntables", ">= 1.0.3"
+  spec.add_runtime_dependency "rake", ">= 10.3.2"
+  spec.add_runtime_dependency 'activerecord', ">= 4.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wlog
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - psyomn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.7
 - !ruby/object:Gem::Dependency
-  name: turntables
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+- !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 4.1.6
 description: Track tasks and time on the command line.
 email:
 - lethaljellybean@gmail.com
@@ -112,6 +126,7 @@ files:
 - lib/wlog.rb
 - lib/wlog/commands/archive_finished_issues.rb
 - lib/wlog/commands/archive_issues.rb
+- lib/wlog/commands/bootstrap_templates.rb
 - lib/wlog/commands/commandable.rb
 - lib/wlog/commands/concat_description.rb
 - lib/wlog/commands/delete_issue.rb
@@ -120,7 +135,6 @@ files:
 - lib/wlog/commands/new_entry.rb
 - lib/wlog/commands/replace_pattern.rb
 - lib/wlog/commands/taint_setup.rb
-- lib/wlog/db_registry.rb
 - lib/wlog/domain.rb
 - lib/wlog/domain/attachment.rb
 - lib/wlog/domain/helpers.rb
@@ -129,15 +143,12 @@ files:
 - lib/wlog/domain/key_value.rb
 - lib/wlog/domain/log_entry.rb
 - lib/wlog/domain/session.rb
-- lib/wlog/domain/sql_modules/attachment_sql.rb
-- lib/wlog/domain/sql_modules/issue_sql.rb
-- lib/wlog/domain/sql_modules/key_value_sql.rb
-- lib/wlog/domain/sql_modules/log_entry_sql.rb
 - lib/wlog/domain/sql_modules/polymorphic_attachments_sql.rb
 - lib/wlog/domain/static_configurations.rb
 - lib/wlog/domain/sys_config.rb
 - lib/wlog/domain/template_engine.rb
 - lib/wlog/domain/timelog_helper.rb
+- lib/wlog/migrations/make_standard_tables.rb
 - lib/wlog/sql/mono/1.sql
 - lib/wlog/sql/seq/.gitkeep
 - lib/wlog/sql/seq/2.sql
@@ -147,13 +158,15 @@ files:
 - lib/wlog/tech/wlog_string.rb
 - lib/wlog/ui/bootstrap.rb
 - lib/wlog/ui/cli_interface.rb
-- lib/wlog/ui/commands/attach_to_issue.rb
 - lib/wlog/ui/commands/attach_to_log_entry.rb
 - lib/wlog/ui/commands/create_issue.rb
 - lib/wlog/ui/commands/ui_command.rb
 - lib/wlog/ui/configuration_ui.rb
+- lib/wlog/ui/edit_handler.rb
+- lib/wlog/ui/invoice_ui.rb
 - lib/wlog/ui/issue_ui.rb
 - lib/wlog/ui/setup_wizard.rb
+- lib/wlog/ui/template_ui.rb
 - lib/wlog/version.rb
 - spec/domain/attachment_spec.rb
 - spec/domain/commands/concat_desc_spec.rb
@@ -189,10 +202,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: 'A light ruby script to help track tasks and time  commit: f1fbaee'
+summary: 'A light ruby script to help track tasks and time  commit: e10bdee'
 test_files:
 - spec/domain/attachment_spec.rb
 - spec/domain/commands/concat_desc_spec.rb

data/lib/wlog/db_registry.rb

@@ -1,38 +0,0 @@
-require 'sqlite3'
-require 'fileutils'
-
-require 'wlog/domain/static_configurations.rb'
-
-module Wlog
-# The db registry, using sqlite3
-# @author Simon Symeonidis
-class DbRegistry
-  include StaticConfigurations
-
-  def initialize(dbname)
-    @handle = SQLite3::Database.new(dbname || "#{DataDirectory}#{ARGV[0] || DefaultDb}")
-  end
-
-  # execute a sql with varargs parameters
-  # @param *sql, first the sql string, then the parameters if the statement is
-  #   to be prepared. 
-  # @example Simple Usage
-  #   DbRegistry.execute("SELECT * FROM table WHERE id = ?", 1)
-  def execute(*sql)
-    @handle.execute(*sql)
-  end
-
-  # Get the last row, given a table name. The table needs to have an id
-  def last_row_from(tablename)
-    query = "SELECT * FROM #{tablename} WHERE id =(SELECT MAX(id) FROM"\
-      " #{tablename});"
-    @handle.execute(query)
-  end
-
-  # the database handle
-  attr_accessor :handle
-
-private
-end
-end # module Wlog
-

data/lib/wlog/domain/sql_modules/attachment_sql.rb

@@ -1,21 +0,0 @@
-module Wlog
-# The sql for attachments
-# @author Simon Symeonidis
-module AttachmentSql
-  # The table name 
-  TableName = "attachments"
-
-  # Insert the file data into the database (NOTE wondering if small/big endian
-  # will be affecting this...)
-  InsertSql = "INSERT INTO #{TableName} (filename, given_name, data) "\
-    "values (?, ?, ?); "
-
-  # Delete by id
-  DeleteSql = "DELETE FROM #{TableName} WHERE discriminator = ? AND "\
-    "discriminator_id = ?;" 
-
-  # Select an attachment given an id
-  SelectSql = "SELECT * FROM #{TableName} WHERE id = ? "
-end
-end
-

data/lib/wlog/domain/sql_modules/issue_sql.rb

@@ -1,37 +0,0 @@
-module Wlog
-# Issue SQL 
-# @author Simon Symeonidis
-module IssueSql
-  # The table name of the log entries table
-  TableName = "issues"
-
-  # Standard insert
-  InsertSql = \
-    "INSERT INTO #{TableName} "\
-    "(description, reported_date, due_date, status, timelog,"\
-    "long_description) "\
-    "values (?,?,?,?,0,?);"
-  # Standard delete
-  DeleteSql = "DELETE FROM #{TableName} WHERE id = ? ;"
-
-  # Standard update
-  UpdateSql = "UPDATE #{TableName} SET "\
-    "description = ? , reported_date = ? , due_date = ? , status = ?, "\
-    "timelog = ? "\
-    "WHERE id = ?;"
-  
-  # Select by id
-  SelectSql = "SELECT * FROM #{TableName} WHERE id = ? ;"
-
-  # Select all the issues (which are not archived)
-  SelectAllSql = "SELECT * FROM #{TableName} WHERE status <> 3; "
-
-  # Select issues that are finished
-  SelectFinishedSql = "SELECT * FROM #{TableName} WHERE status = 2"
-
-  # Select issues given a time range
-  SelectTimeRange = "SELECT * FROM #{TableName}"\
-    " WHERE reported_date >= ? AND reported_date <= ?"
-end
-end
-

data/lib/wlog/domain/sql_modules/key_value_sql.rb

@@ -1,20 +0,0 @@
-module Wlog
-# Encapsulate the sql in only one part.
-# @author Simon Symeonidis
-module KeyValueSql
-  # The table name of the log entries table
-  TableName = "key_values"
-
-  # Standard insert
-  InsertSql = \
-    "INSERT INTO #{TableName} (key,value) values (?,?);"
-  # Standard delete
-  DeleteSql = "DELETE FROM #{TableName} WHERE key = ? ;"
-
-  # Standard update
-  UpdateSql = "UPDATE #{TableName} SET value = ? WHERE key = ?;"
-  
-  # Select by key
-  Select = "SELECT * FROM #{TableName} WHERE key = ? ;"
-end
-end

data/lib/wlog/domain/sql_modules/log_entry_sql.rb

@@ -1,35 +0,0 @@
-module Wlog
-# Encapsulate the sql in only one part.
-# @author Simon Symeonidis
-module LogEntrySql
-  # The table name of the log entries table
-  TableName = "log_entries"
-
-  # Standard insert
-  InsertSql = \
-    "INSERT INTO #{TableName} (description,date,issue_id) values (?,?,?);"
-  # Standard delete
-  DeleteSql = "DELETE FROM #{TableName} WHERE id = ? ;"
-
-  # Standard select all
-  SelectAll = "SELECT * FROM #{TableName} ORDER BY date ASC;"
-  
-  # Standard update
-  UpdateSql = "UPDATE #{TableName} SET description = ? WHERE id = ?;"
-  
-  # select all with a limit
-  SelectAllLimit = \
-    "SELECT * FROM #{TableName} WHERE date >="\
-    " #{Time.now.to_i - 604800 - 24 * 60 * 60} ORDER BY date ASC"
-  
-  # Select by id
-  Select = "SELECT * FROM #{TableName} WHERE id = ? ;"
-  
-  # Select by id
-  SelectAllByIssue = "SELECT * FROM #{TableName} WHERE issue_id = ? ;"
-
-  # Select by a regex like /.../i
-  SelectDescriptionLike = \
-    "SELECT * FROM #{TableName} WHERE description LIKE ?;"
-end
-end