jreport 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da5eff62ec40d1bcc81f332f2eef526325380d3
-  data.tar.gz: 72f92a5340188480786252b499b6ad7cb4ee88d9
+  metadata.gz: 3e90d044d33399cc0febc3c48ec6e5fd19815f2a
+  data.tar.gz: c873f6faf7fcbfaae4403df5f990c7f1a4129ee6
 SHA512:
-  metadata.gz: afed56f6d4bfd262e423155bb918cbc3b7b3eb6dcff32c89661e19345a3d879cf5750a41a07c69e5d8208fb20a2a314833dbe723a48c314c35252ff4f14500fe
-  data.tar.gz: 0fafca00b020f023fb0f8b40c836fbd493b2997d7d909444d93ab076743591a366afa0e347863e2aea1068cd559bc41fbb0eb59a46958f2bebb7b3af0f476d42
+  metadata.gz: 6fb41a4682255dafc88aa907e3565b9c8a0bcdfc6a43fb03cb5dc511ce53bbc3772772f55a537b6bc3242f9ad1151c04c9c7a73a45f0bfca4dbef350d28e199c
+  data.tar.gz: 9df2290597bc2b0b2a773463b8e3d40103abeabdf106740039414f69a9293bdae03ed183cfb0b751e2492caad692d3aa000951943355466060197e9da2365c28

data/bin/jreport

@@ -67,6 +67,7 @@ module JreportCommand
       pwd=`pwd`.chomp<<"/#{project}"
       skel=File.expand_path('../../skel',__FILE__)
       `cp -r "#{skel}" "./#{project}" && rm -fr ./"#{project}"/{collectors,controllers,views,models,db/migrate}/* `
+      puts "#{project} created!"
     end
     
     desc 'make REPORT','generate and send REPORT'
@@ -82,4 +83,4 @@ module JreportCommand
   
 end
 
-JreportCommand::JreportMainCmd.start(ARGV)
+JreportCommand::JreportMainCmd.start(ARGV)

data/lib/jreport/assembler.rb

@@ -16,7 +16,6 @@ module Jreport
     end
     def make_report
       controller="#{@report}Controller"
-      raise "Can't find #{controller}" unless Kernel.const_defined?(controller)
       ctrl_klas=Kernel.const_get(controller)
       mtds=ctrl_klas.instance_methods(false).grep /_report$/
       mtds.each do |m|
@@ -64,13 +63,9 @@ module Jreport
             body options['body']
             content_type options['content-type']
           end
-          if options['files']
-            options['files'].split(';').each do |f|
-              add_file f
-            end
-          end
         end
-        m.deliver
+        m.deliver!
+	puts 'Sent!'
       rescue=>e
         puts "Send mail faild!"
         puts e.backtrace
@@ -78,4 +73,4 @@ module Jreport
     end
     
   end
-end
+end

data/lib/jreport/version.rb

@@ -1,3 +1,3 @@
 module Jreport
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/skel/boot.rb

@@ -1,7 +1,7 @@
-JreportRoot=File.expand_path('..',__FILE__)
+require 'bundler'
+Bundler.require(:default)
 
-require 'active_record'
-require 'sqlite3'
+JreportRoot=File.expand_path('..',__FILE__)
 
 # Load db models
 require JreportRoot+'/db/connection'

data/skel/db/connection.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'yaml'
 
 dbconfig = YAML::load(File.open(File.expand_path('..',__FILE__)+'/database.yml'))  
 ActiveRecord::Base.establish_connection(dbconfig) 

data/skel/rakefile

@@ -1,4 +1,7 @@
+require 'bundler'
+Bundler.require(:deafult)
 require './db/connection'
+
 Dir.glob('tasks/*.rake').each { |r| import r }
 
 desc "default task, do nothing"
@@ -10,6 +13,7 @@ namespace 'db' do
 	desc "migrate database tables"
 	task :migrate do  
 	  ActiveRecord::Migrator.migrate('db/migrate', ENV["VERSION"] ? ENV["VERSION"].to_i : nil )  
+	  puts 'Complete migration'
 	end
 	desc "drop database" 
 	task :drop do 
@@ -20,4 +24,4 @@ namespace 'db' do
 	task :reset=>[:drop] do 
 		Rake::Task['db:migrate'].invoke
 	end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jreport
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - qjpcpu