techcor 0.0.8 → 0.0.9

data/Gemfile

@@ -16,7 +16,7 @@ group :development do
 end
 
 gem 'activesupport'
-gem 'mongoid', '~> 3.0.0.rc'
+gem 'mongoid', :git => 'https://github.com/mongoid/mongoid.git'
 gem 'bson_ext'
 gem 'hirb'
 gem 'gli', '~> 2.0.0.rc'

data/Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/mongoid/mongoid.git
+  revision: 216839d66c7a7017a7e07e4fa8126ca686ca191e
+  specs:
+    mongoid (3.0.0.rc)
+      activemodel (~> 3.1)
+      moped (~> 1.0.0.rc)
+      origin (~> 1.0.1)
+      tzinfo (~> 0.3.22)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -42,11 +52,6 @@ GEM
       rdoc
     json (1.7.3)
     method_source (0.7.1)
-    mongoid (3.0.0.rc)
-      activemodel (~> 3.1)
-      moped (~> 1.0.0.rc)
-      origin (~> 1.0.0.rc)
-      tzinfo (~> 0.3.22)
     mongoid-rspec (1.4.6)
       mongoid (>= 3.0.0.rc)
       rake
@@ -88,7 +93,7 @@ DEPENDENCIES
   gli (~> 2.0.0.rc)
   hirb
   jeweler
-  mongoid (~> 3.0.0.rc)
+  mongoid!
   mongoid-rspec
   pry
   rake

data/config/mongoid.yml

@@ -21,11 +21,7 @@ test:
 production:
   sessions:
     default:
-      hosts:
-        - <%= ENV['MONGOID_HOST'] || 'localhost' %>:<%= ENV['MONGOID_PORT'] || '27017' %>
-      database: <%= ENV['MONGOID_DATABASE'] || 'techcor_production' %>
-      username: <%= ENV['MONGOID_USERNAME'] %>
-      password: <%= ENV['MONGOID_PASSWORD'] %>
+      uri: <%= ENV['MONGOHQ_URL'] %>
       logger: false
   options:
     raise_not_found_error: false

data/config/mongoid.yml.sample

@@ -21,11 +21,7 @@ test:
 production:
   sessions:
     default:
-      hosts:
-        - <%= ENV['MONGOID_HOST'] || 'localhost' %>:<%= ENV['MONGOID_PORT'] || '27017' %>
-      database: <%= ENV['MONGOID_DATABASE'] || 'techcor_production' %>
-      username: <%= ENV['MONGOID_USERNAME'] %>
-      password: <%= ENV['MONGOID_PASSWORD'] %>
+      uri: mongodb://localhost:27017/techcor_production
       logger: false
   options:
     raise_not_found_error: false

data/lib/commands/describe_project.rb

@@ -1,6 +1,6 @@
 class DescribeProject < Struct.new :project_name, :date_format
-  def call formatter = formatter, records = records
-    formatter.present records
+  def call formatter_class = ConsoleFormatter, records = records
+    formatter(formatter_class).present records
   end
 
   def project project_name = project_name
@@ -11,8 +11,8 @@ class DescribeProject < Struct.new :project_name, :date_format
     project.metrics
   end
 
-  def formatter format = format
-    ConsoleFormatter.new format
+  def formatter formatter_class, format = format
+    formatter_class.new format
   end
 
   def format date_format = date_format

data/lib/commands/gli/describe.rb

@@ -9,7 +9,7 @@ class TechcorCli
     command.flag :df, :date_format
 
     command.action do |global, options, args|
-      puts DescribeProject.new(args.first, options[:date_format]).call
+      puts DescribeProject.new(args.first, options[:date_format]).call ConsoleFormatter
     end
   end
 

data/lib/commands/gli/list.rb

@@ -8,7 +8,7 @@ class TechcorCli
     command.flag :fm, :format
 
     command.action do |global, options, args|
-      puts ListProjects.new(options[:format], args.first).call
+      puts ListProjects.new(options[:format], args.first).call ConsoleFormatter
     end
   end
 end

data/lib/commands/list_projects.rb

@@ -1,14 +1,14 @@
 class ListProjects < Struct.new :format, :criteria
-  def call formatter = formatter, projects = projects
-    formatter.present projects
+  def call formatter_class = formatter_class, projects = projects
+    formatter(formatter_class).present projects
   end
 
   def projects catalog = ProjectCatalog.load, criteria = criteria
     catalog.projects criteria
   end
 
-  def formatter(format = format.present? ? eval(format) : default_format)
-    ConsoleFormatter.new format
+  def formatter(formatter_class, format = format.present? ? eval(format) : default_format)
+    formatter_class.new format
   end
 
   def default_format projects = projects

data/lib/console_formatter.rb

@@ -1,18 +1,7 @@
 class ConsoleFormatter < Struct.new :format
+  include Formatter
 
-  def present records, format = format
-    Hirb::Helpers::AutoTable.render(render_each(records), fields: format.keys, resize: false)
-  end
-
-  def render_each records
-    records.map { |record|
-      render_record record
-    }
-  end
-
-  def render_record record, format = format
-    format.merge(format) do |_, expression|
-      record.instance_eval expression
-    end
+  def present records
+    Hirb::Helpers::AutoTable.render(render_each(records, format), fields: format.keys, resize: false)
   end
 end

data/lib/formatter.rb

@@ -0,0 +1,14 @@
+module Formatter
+  def render_each records, format
+    records.map { |record|
+      render_record record, format
+    }
+  end
+
+  def render_record record, format
+    format.merge(format) do |_, expression|
+      record.instance_eval expression
+    end
+  end
+
+end

data/lib/techcor/version.rb

@@ -2,7 +2,7 @@ module Techcor
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 8
+    PATCH = 9
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/techcor.rb

@@ -11,6 +11,7 @@ $: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 require 'project'
 require 'property_value'
 require 'project_catalog'
+require 'formatter'
 require 'console_formatter'
 require 'metrics/metric'
 require 'metrics/number_metric'
@@ -25,4 +26,4 @@ require 'commands/describe_project'
 require 'storage/metric_mongo'
 require 'storage/project_mongo'
 require 'storage/property_value_mongo'
-require 'techcor/seed'
+require 'techcor/seed'

data/spec/lib/commands/describe_project_spec.rb

@@ -1,20 +1,25 @@
 require 'spec_helper'
 
 describe DescribeProject do
-  it 'presents properties to table view' do
-    result = stub(:result)
 
+  class DummyDescribeFormatter < Struct.new :format
+    def present records
+      records
+    end
+  end
+
+
+  it 'presents properties to table view' do
     records = stub(:records)
-    formatter = stub(:formatter).tap { |f| f.should_receive(:present).with(records) { result } }
 
-    subject.call(formatter, records).should == result
+    subject.call(DummyDescribeFormatter, records).should == records
   end
 
-  it 'passes format to console formatter' do
+  it 'passes format to formatter class' do
     format = stub(:format)
-    ConsoleFormatter.should_receive(:new).with(format)
+    formatter = stub.tap { |f| f.should_receive(:new).with(format) }
 
-    subject.formatter(format)
+    subject.formatter(formatter, format)
   end
 
   it 'collects metrics from project' do

data/spec/lib/commands/list_projects_spec.rb

@@ -1,11 +1,17 @@
 require 'spec_helper'
 
 describe ListProjects do
-  it 'passes format to console formatter' do
+
+  class DummyListFormatter < Struct.new :format
+    def present records
+      records
+    end
+  end
+
+  it 'passes format to formatter class' do
     format = '42'
-    ConsoleFormatter.should_receive(:new).with(eval(format))
 
-    ListProjects.new(format).formatter
+    ListProjects.new(format).formatter(DummyListFormatter).format.should == 42
   end
 
   it 'gets list of projects from catalog according to criteria' do
@@ -18,12 +24,9 @@ describe ListProjects do
   end
 
   it 'presents projects to table view' do
-    result = stub(:result)
-
     projects = stub(:projects)
-    formatter = stub(:formatter).tap { |f| f.should_receive(:present).with(projects) { result } }
 
-    subject.call(formatter, projects).should == result
+    ListProjects.new('42').call(DummyListFormatter, projects).should == projects
   end
 
   it 'uses default format if no format string was specified' do
@@ -32,7 +35,7 @@ describe ListProjects do
     command = ListProjects.new(nil)
     command.should_receive(:default_format) { result }
 
-    command.formatter
+    command.formatter(DummyListFormatter)
   end
 
   it 'builds default format as list of all metrics for all projects' do

data/spec/lib/console_formatter_spec.rb

@@ -5,25 +5,12 @@ describe ConsoleFormatter do
     format = stub(:format, :keys => stub(:format_keys))
     records = stub(:records)
 
-    subject.stub(:render_each => records)
+    formatter = ConsoleFormatter.new(format)
+    formatter.stub(:render_each => records)
 
     Hirb::Helpers::AutoTable.should_receive(:render).with(records, fields: format.keys, resize: false)
 
-    subject.present(records, format)
+    formatter.present(records)
   end
 
-  it 'renders each record in collection' do
-    record = stub(:record)
-
-    subject.should_receive(:render_record).with(record).twice
-    subject.render_each([record, record])
-  end
-
-  it 'uses expressions in format to render each record' do
-    expression = stub(:expression)
-    format = {stub(:key) => expression}
-    record = stub(:record).tap { |p| p.should_receive(:instance_eval).with(expression) }
-
-    subject.render_record record, format
-  end
 end

data/spec/lib/formatter_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Formatter do
+  subject {
+    class DummyFormatter
+      include Formatter
+    end.new
+  }
+  it 'renders each record in collection' do
+    record = stub(:record)
+    format = stub(:format)
+
+    subject.should_receive(:render_record).with(record, format).twice
+    subject.render_each([record, record], format)
+  end
+
+  it 'uses expressions in format to render each record' do
+    expression = stub(:expression)
+    format = {stub(:key) => expression}
+    record = stub(:record).tap { |p| p.should_receive(:instance_eval).with(expression) }
+
+    subject.render_record record, format
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: techcor
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - lib/commands/list_projects.rb
 - lib/commands/view_history.rb
 - lib/console_formatter.rb
+- lib/formatter.rb
 - lib/gli_interface.rb
 - lib/metrics/boolean_metric.rb
 - lib/metrics/metric.rb
@@ -273,6 +274,7 @@ files:
 - spec/lib/commands/list_projects_spec.rb
 - spec/lib/commands/view_history_spec.rb
 - spec/lib/console_formatter_spec.rb
+- spec/lib/formatter_spec.rb
 - spec/lib/metrics/boolean_metric_spec.rb
 - spec/lib/metrics/metric_spec.rb
 - spec/lib/metrics/number_metric_spec.rb
@@ -298,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1310382809361252165
+      hash: -809524545492569509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: