sappho-data-publisher 0.1.8 → 0.1.9

data/lib/sappho-data-publisher/atlassian_app.rb

@@ -3,7 +3,7 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'sappho-data-publisher/modules'
+require 'sappho-basics/module_register'
 
 module Sappho
   module Data
@@ -19,9 +19,9 @@ module Sappho
 
         def connect
           raise "you have already attempted to connect to #{@appName}" if @appServer or @loggedIn
-          modules = Modules.instance
+          modules = Sappho::ModuleRegister.instance
           @config = modules.get :configuration
-          @logger = modules.get :logger
+          @logger = modules.get :log
           url = @config.data["#{@appName.downcase}.url"]
           mock = "mock#{@appName}"
           @appServer = modules.set?(mock) ? modules.get(mock).mockInstance(url) : yield(url)

data/lib/sappho-data-publisher/configuration.rb

@@ -3,7 +3,7 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'sappho-data-publisher/modules'
+require 'sappho-basics/module_register'
 require 'yaml'
 
 module Sappho
@@ -17,7 +17,7 @@ module Sappho
         def initialize filename = ARGV[0]
           filename = File.expand_path(filename || 'config.yml')
           @data = YAML.load_file filename
-          Modules.instance.get(:logger).info "configuration loaded from #{filename}"
+          Sappho::ModuleRegister.instance.get(:log).info "configuration loaded from #{filename}"
         end
 
       end

data/lib/sappho-data-publisher/custom_liquid.rb

@@ -3,10 +3,8 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'rubygems'
-gem 'liquid'
 require 'liquid'
-require 'sappho-data-publisher/modules'
+require 'sappho-basics/module_register'
 
 module Sappho
   module Data
@@ -24,7 +22,7 @@ module Sappho
 
           def fullname username
             begin
-              name = Modules.instance.get('AddressBook').getUserFullName(username)
+              name = Sappho::ModuleRegister.instance.get('AddressBook').getUserFullName(username)
               raise 'unknown person' unless name and name.length > 0
             rescue
               name = '** John Doe **'

data/lib/sappho-data-publisher/publisher.rb

@@ -3,11 +3,9 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'rubygems'
-gem 'liquid'
 require 'liquid'
 require 'yaml'
-require 'sappho-data-publisher/modules'
+require 'sappho-basics/module_register'
 
 module Sappho
   module Data
@@ -16,8 +14,8 @@ module Sappho
       class Publisher
 
         def publish
-          modules = Modules.instance
-          logger = modules.get :logger
+          modules = Sappho::ModuleRegister.instance
+          logger = modules.get :log
           configurator = modules.get modules.get(:configuration).data['config.module']
           globalScript = ''
           configurator.getScript(configurator.getGlobalConfiguration) { |configChunk| globalScript += configChunk }

data/lib/sappho-data-publisher/version.rb

@@ -7,7 +7,7 @@ module Sappho
   module Data
     module Publisher
       NAME = 'sappho-data-publisher'
-      VERSION = '0.1.8'
+      VERSION = '0.1.9'
       AUTHORS = ['Andrew Heald']
       EMAILS = ['andrew@heald.co.uk']
       HOMEPAGE = 'https://github.com/sappho/sappho-data-publisher/wiki'

data/lib/sappho-data-publisher.rb

@@ -3,8 +3,7 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'logger'
-require 'sappho-data-publisher/modules'
+require 'sappho-basics/module_register'
 require 'sappho-data-publisher/publisher'
 require 'sappho-data-publisher/configuration'
 require 'sappho-data-publisher/confluence'
@@ -19,13 +18,9 @@ module Sappho
       class CommandLine
 
         def CommandLine.process
-          $stdout.sync = true
-          logger = Logger.new $stdout
-          logger.level = Logger::INFO
-          logger.formatter = proc { |severity, datetime, progname, msg| "#{msg}\n" }
-          logger.info "sappho-data-publisher version #{VERSION} - #{HOMEPAGE}"
-          modules = Modules.instance
-          modules.set :logger, logger
+          ENV['application.log.detail'] = 'message'
+          modules = Sappho::ModuleRegister.instance
+          modules.get(:log).info "sappho-data-publisher version #{VERSION} - #{HOMEPAGE}"
           modules.set :configuration, Configuration.new
           jira = Jira.new
           jira.connect

data/test/ruby/confluence_test.rb

@@ -8,7 +8,6 @@ require 'helper'
 class ConfluenceTest < Test::Unit::TestCase
 
   def setup
-    setupLogging
     setupConfiguration
     setupConfluence 'Confluence'
     @mockConfluence.setScenario 'page-op-tests'

data/test/ruby/custom_liquid_test.rb

@@ -3,16 +3,13 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'rubygems'
-gem 'liquid', '>= 2.3.0'
+require 'helper'
 require 'liquid'
 require 'sappho-data-publisher/custom_liquid'
-require 'helper'
 
 class CustomLiquidTest < Test::Unit::TestCase
 
   def setup
-    setupLogging
     setupConfiguration
     setupJira 'AddressBook'
     @jira.connect

data/test/ruby/helper.rb

@@ -3,10 +3,12 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require "test/unit"
-require 'logger'
+require 'rubygems'
+gem 'liquid'
+gem 'sappho-basics'
+require 'test/unit'
 require 'yaml'
-require 'sappho-data-publisher/modules'
+require 'sappho-basics/module_register'
 require 'sappho-data-publisher/configuration'
 require 'sappho-data-publisher/jira'
 require 'sappho-data-publisher/confluence'
@@ -15,33 +17,27 @@ require 'mock_confluence'
 
 class Test::Unit::TestCase
 
-  def setupLogging
-    @logger = Logger.new STDOUT
-    @logger.level = Logger::DEBUG
-    Sappho::Data::Publisher::Modules.instance.set :logger, @logger
-  end
-
   def setupConfiguration (filename = testFilename('config/config.yml'))
     config = Sappho::Data::Publisher::Configuration.new filename
-    Sappho::Data::Publisher::Modules.instance.set :configuration, config
+    Sappho::ModuleRegister.instance.set :configuration, config
   end
 
   def setupJira (moduleName, dataFilename = testFilename('data/jira.yml'))
     @mockJira = MockJira.new dataFilename
-    Sappho::Data::Publisher::Modules.instance.set 'mockJira', @mockJira
+    Sappho::ModuleRegister.instance.set 'mockJira', @mockJira
     @jira = Sappho::Data::Publisher::Jira.new
-    Sappho::Data::Publisher::Modules.instance.set moduleName, @jira
+    Sappho::ModuleRegister.instance.set moduleName, @jira
   end
 
   def setupConfluence moduleName
     @mockConfluence = MockConfluence.new
-    Sappho::Data::Publisher::Modules.instance.set 'mockConfluence', @mockConfluence
+    Sappho::ModuleRegister.instance.set 'mockConfluence', @mockConfluence
     @confluence = Sappho::Data::Publisher::Confluence.new
-    Sappho::Data::Publisher::Modules.instance.set moduleName, @confluence
+    Sappho::ModuleRegister.instance.set moduleName, @confluence
   end
 
   def teardown
-    Sappho::Data::Publisher::Modules.instance.shutdown
+    Sappho::ModuleRegister.instance.shutdown
   end
 
   def testFilename filename

data/test/ruby/jira_test.rb

@@ -8,7 +8,6 @@ require 'helper'
 class JiraTest < Test::Unit::TestCase
 
   def setup
-    setupLogging
     setupConfiguration
     setupJira 'Jira'
     @expectedResults = YAML.load_file testFilename 'data/jira-results.yml'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-data-publisher
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -50,6 +50,22 @@ dependencies:
         version: 2.3.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sappho-basics
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id003
 description: See the project home page for more information
 email: 
 - andrew@heald.co.uk
@@ -66,7 +82,6 @@ files:
 - lib/sappho-data-publisher/confluence.rb
 - lib/sappho-data-publisher/custom_liquid.rb
 - lib/sappho-data-publisher/jira.rb
-- lib/sappho-data-publisher/modules.rb
 - lib/sappho-data-publisher/publisher.rb
 - lib/sappho-data-publisher/version.rb
 - lib/sappho-data-publisher.rb

data/lib/sappho-data-publisher/modules.rb

@@ -1,49 +0,0 @@
-# See https://github.com/sappho/sappho-data-publisher/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-
-require 'singleton'
-
-module Sappho
-  module Data
-    module Publisher
-
-      class Modules
-
-        include Singleton
-
-        def initialize
-          @modules = {}
-        end
-
-        def set name, mod
-          @modules[name] = mod
-        end
-
-        def get name
-          @modules[name]
-        end
-
-        def set? name
-          @modules.has_key? name
-        end
-
-        def shutdown
-          each { |mod| mod.shutdown }
-        end
-
-        def each
-          @modules.each do |name, mod|
-            begin
-              yield mod
-            rescue
-            end
-          end
-        end
-
-      end
-
-    end
-  end
-end