larva 0.9.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d881b296762829b1231faf641557de3f07fd026
-  data.tar.gz: 7f5e4c25ef8b107f6a321e7d7fa8cdac5874901c
+  metadata.gz: 56edc62f830f8beaa3862dcb8ff381f1cd4b35d2
+  data.tar.gz: 7a77450848d9d87cb6b50f9ac95486cce0fdd8c5
 SHA512:
-  metadata.gz: 591e77b84ca81e4df51cd338982d869486ccbef30d61bc9fc0027cf3f9521858263554786dba168939a33ae36eadb3cd860fa1837ca18f1cd364359c82ab0222
-  data.tar.gz: 7e178491832e605929b2d9a8d279bfc9a912327d369eef11d09b4b6677ed907b36a3acc5118b5d42a1854fc78a11578483f9ba05905b7265fbfb00c8654f97b1
+  metadata.gz: 330518dec7552c9150b65fa6ae78c7f12283da832344be782f4db5a48c3795aee8463cdb2f3809f78dc3d260269467fb43604fe06b204d64421c5009697ec923
+  data.tar.gz: b928a17b94ce057fd544c39824dfe9be8fcdabbdd72c97b070210ce30339de611cb0d271fe64f2544eff418c9e915109b45ee8a9e2d291b12ac5d08a0827fb71

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.0 / 2014-07-12
+* [FEATURE] Remove Meducation specific code and bump to 1.0.0
+
 # 0.9.2 / 2014-04-30
 * [BIGFIX] Do not add suffix to queue names - added by Propono.
 

data/bin/larva

@@ -1,70 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
-require 'active_support/core_ext'
-
-class DaemonCreator
-  def self.create(*args)
-    new(*args).create
-  end
-
-  def initialize(pwd, daemon_name)
-    @pwd = pwd
-    @template_dir = File.expand_path('../../template', __FILE__)
-    @daemon_name = daemon_name
-    @daemon_dir = "#{pwd}/#{daemon_name}"
-  end
-
-  def create
-    error_exit("Please provide a daemon name. e.g. larva spawn my_daemon_name") if @daemon_name.blank?
-    error_exit("Directory #{@daemon_dir} already exists. Please remove it before continuing.") if File.exists?(@daemon_dir)
-
-    # Copy template directory
-    FileUtils.cp_r(@template_dir, @daemon_dir)
-    rename_directories
-    rename_files
-    rename_file_contents
-    git_it_up
-    $stdout.puts "Daemon '#{@daemon_name}' created succesfully :)"
-  end
-
-  private
-
-  def rename_directories
-    Dir.glob("#{@daemon_dir}/**/*/").each do |original_path|
-      new_path = original_path.gsub('larva_spawn', @daemon_name)
-      next if new_path == original_path
-
-      FileUtils.mv(original_path, new_path)
-      rename_directories
-      return
-    end
-  end
-
-  def rename_files
-    Dir.glob("#{@daemon_dir}/**/*").each do |original_path|
-      new_path = original_path.gsub('larva_spawn', @daemon_name)
-      FileUtils.mv(original_path, new_path) if new_path != original_path
-    end
-  end
-
-  def rename_file_contents
-    Dir.glob("#{@daemon_dir}/**/*").each do |path|
-      next unless File.file?(path)
-      contents = File.read(path)
-      File.open(path, 'w+') do |file|
-        contents.gsub!("LarvaSpawn", @daemon_name.camelize)
-        contents.gsub!("larva_spawn", @daemon_name)
-        contents.gsub!("LARVA_SPAWN", @daemon_name.upcase)
-        file.write(contents)
-      end
-    end
-  end
-
-  def git_it_up
-    `cd #{@daemon_name} && git init && git add . && git commit -am "Create basic daemon" && cd ..`
-  end
-end
+require 'larva'
 
 def error_exit(error)
   $stderr.puts "!! Error: #{error}"
@@ -72,4 +8,4 @@ def error_exit(error)
 end
 
 error_exit("Please provide a valid command. Valid commands: spawn") unless ARGV[0] == "spawn"
-DaemonCreator.create(ENV["PWD"], ARGV[1])
+Larva::DaemonCreator.create(ENV["PWD"], ARGV[1])

data/lib/larva.rb

@@ -2,14 +2,16 @@ require 'active_support/core_ext'
 require 'filum'
 require 'propono'
 
-require 'larva/configuration'
-require 'larva/configurator'
-require 'larva/mocker'
-require 'larva/listener'
-require 'larva/processor'
-require 'larva/worker_pool'
-require 'larva/daemon'
-require 'larva/message_replayer'
+require_relative 'larva/configuration'
+require_relative 'larva/configurator'
+require_relative 'larva/mocker'
+require_relative 'larva/listener'
+require_relative 'larva/processor'
+require_relative 'larva/worker_pool'
+require_relative 'larva/daemon'
+require_relative 'larva/message_replayer'
+
+require_relative 'larva/daemon_creator'
 
 module Larva
   class LarvaError < StandardError

data/lib/larva/configurator.rb

@@ -18,17 +18,6 @@ module Larva
       Filum.setup(@logfile)
       Filum.logger.info "Configuring Daemon"
 
-      if meducation_sdk_config = parse_config_file('meducation-sdk.yml')
-        MeducationSDK.config do |config|
-          config.access_id  = meducation_sdk_config[:access_id]
-
-          # Don't use fetch for these as nil values might be deliberately passed it
-          config.secret_key = @options[:meducation_sdk_secret_key] || meducation_sdk_config[:secret_key]
-          config.endpoint   = @options[:meducation_sdk_endpoint ] || "http://localhost:3000/spi" if @env == 'development'
-          config.logger     = Filum.logger
-        end
-      end
-
       if propono_config = parse_config_file('propono.yml')
         Propono.config do |config|
           config.use_iam_profile  = propono_config[:use_iam_profile]
@@ -42,6 +31,8 @@ module Larva
           config.logger           = Filum.logger
         end
       end
+
+      after_configure if respond_to?(:after_configure)
     end
 
     private

data/lib/larva/daemon.rb

@@ -9,7 +9,6 @@ module Larva
 
     # Allowed Options:
     #   :env - Defaults to development
-    #   :meducation_sdk_secret_key - Defauls to looking in config file
     def initialize(processors, options = {})
       @processors = processors
       @options = options

data/lib/larva/daemon_creator.rb

@@ -0,0 +1,68 @@
+require 'fileutils'
+require 'active_support/core_ext'
+
+module Larva
+  class DaemonCreator
+    def self.create(*args)
+      new(*args).create
+    end
+
+    attr_reader :template_dir, :daemon_name, :daemon_dir
+    def initialize(pwd, daemon_name)
+      @template_dir = File.expand_path('../../../template', __FILE__)
+      @daemon_name = daemon_name
+      @daemon_dir = "#{pwd}/#{daemon_name}"
+    end
+
+    def create
+      error_exit("Please provide a daemon name. e.g. larva spawn my_daemon_name") if daemon_name.blank?
+      error_exit("Directory #{daemon_dir} already exists. Please remove it before continuing.") if File.exists?(daemon_dir)
+
+      # Copy template directory
+      FileUtils.cp_r(template_dir, daemon_dir)
+      rename_directories
+      rename_files
+      rename_file_contents
+      alter_files if respond_to?(:alter_files)
+      git_it_up
+      $stdout.puts "Daemon '#{daemon_name}' created succesfully :)"
+    end
+
+    private
+
+    def rename_directories
+      Dir.glob("#{daemon_dir}/**/*/").each do |original_path|
+        new_path = original_path.gsub('larva_spawn', daemon_name)
+        next if new_path == original_path
+
+        FileUtils.mv(original_path, new_path)
+        rename_directories
+        return
+      end
+    end
+
+    def rename_files
+      Dir.glob("#{daemon_dir}/**/*").each do |original_path|
+        new_path = original_path.gsub('larva_spawn', daemon_name)
+        FileUtils.mv(original_path, new_path) if new_path != original_path
+      end
+    end
+
+    def rename_file_contents
+      Dir.glob("#{daemon_dir}/**/*").each do |path|
+        next unless File.file?(path)
+        contents = File.read(path)
+        File.open(path, 'w+') do |file|
+          contents.gsub!("LarvaSpawn", daemon_name.camelize)
+          contents.gsub!("larva_spawn", daemon_name)
+          contents.gsub!("LARVA_SPAWN", daemon_name.upcase)
+          file.write(contents)
+        end
+      end
+    end
+
+    def git_it_up
+      `cd #{daemon_name} && git init && git add . && git commit -am "Create basic daemon" && cd ..`
+    end
+  end
+end

data/lib/larva/message_replayer.rb

@@ -24,7 +24,7 @@ module Larva
       else
         messages.each do |msg|
           sqs_message = Propono::SqsMessage.new(msg)
-          puts "Message : #{sqs_message}"
+          Filum.logger.info "Message : #{sqs_message}"
           sqs.send_message(original_url, sqs_message.to_json_with_exception(StandardError.new "Fake Exception"))
           sqs.delete_message(failed_url, msg['ReceiptHandle'])
         end

data/lib/larva/mocker.rb

@@ -4,18 +4,11 @@ module Larva
       Filum.setup('./log/test.log')
       Propono::Publisher.any_instance.stubs(:publish_via_sns)
 
-      if const_defined?("MeducationSDK")
-        MeducationSDK.config do |config|
-          config.endpoint   = "http://localhost:3000/spi"
-          config.access_id  = "Daemon"
-          config.secret_key = "foobar"
-          config.logger     = Filum.logger
-        end
-      end
-
       Propono.config do |config|
         config.logger = Filum.logger
       end
+
+      after_mock if respond_to?(:after_mock)
     end
   end
 end

data/lib/larva/version.rb

@@ -1,3 +1,3 @@
 module Larva
-  VERSION = '0.9.2'
+  VERSION = '1.0.0'
 end

data/template/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'larva'
-#gem 'meducation_sdk', '~> 1.0'
-
 gem 'rake'
 
 group :test do

data/template/README.md

@@ -4,9 +4,6 @@
 
 There's a few things you need to do:
 
-- If you're using the SDK:
-  - Uncomment the lines in the `Gemfile` and `test/test_helper.rb`
-  - Rename `config/meducation-sdk.yml.optional` to `config/meducation-sdk.yml`
 - Run `bundle install`
 - Run `bundle exec rake test`
 - Add your keys to `config/*`

data/template/lib/larva_spawn.rb

@@ -1,5 +1,4 @@
 require 'larva'
-#require 'meducation_sdk'
 
 require 'larva_spawn/configuration'
 require 'larva_spawn/larva_spawn_error'

data/template/lib/larva_spawn/daemon.rb

@@ -1,10 +1,10 @@
-require 'larva_spawn/processors/media_file_processor'
+require 'larva_spawn/processors/user_processor'
 
 module LarvaSpawn
   class Daemon < Larva::Daemon
     def initialize(options = {})
       processors = {
-        media_file: MediaFileProcessor
+        user: UserProcessor
       }
       super(processors, options)
     end

data/template/lib/larva_spawn/processors/user_processor.rb

@@ -0,0 +1,12 @@
+module LarvaSpawn
+  class UserProcessor < Larva::Processor
+    def user_created
+      do_something(message[:foo])
+    end
+
+    private
+    def do_something(foo)
+    end
+  end
+end
+

data/template/lib/tasks/larva_spawn.rake

@@ -3,7 +3,6 @@ namespace :larva_spawn do
     config_dir = File.expand_path('../../../config', __FILE__)
     logfile = "./log/larva_spawn.log"
     options = {
-      meducation_sdk_secret_key: ENV['LARVA_SPAWN_API_KEY'],
       env: ENV['ENV'],
       config_dir: config_dir,
       logfile: logfile

data/template/test/processors/user_processor_test.rb

@@ -0,0 +1,11 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module LarvaSpawn
+  class UserProcessorTest < Minitest::Test
+    def test_everything_is_wired_up_correctly
+      message = { entity: "user", action: "created", foo: 'bar'}
+      LarvaSpawn::UserProcessor.any_instance.expects(:do_something).with('bar')
+      LarvaSpawn::UserProcessor.process(message)
+    end
+  end
+end

data/template/test/test_helper.rb

@@ -12,8 +12,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'larva_spawn'
 
-#MeducationSDK.mock!
-
 class Minitest::Test
   def setup
     super

data/test/configurator_test.rb

@@ -27,49 +27,6 @@ module Larva
       assert_equal logfile, Filum.logger.logfile
     end
 
-    def test_sdk_secret_key_can_be_overriden
-      sdk_yaml_path = File.expand_path('../../template/config/meducation-sdk.yml', __FILE__)
-      begin
-        optional_sdk_yaml_path = "#{sdk_yaml_path}.optional"
-        `cp #{optional_sdk_yaml_path} #{sdk_yaml_path}`
-        secret_key = "Foobar!"
-        Configurator.configure(logfile: logfile, config_dir: config_dir, meducation_sdk_secret_key: secret_key)
-        assert_equal secret_key, MeducationSDK.config.secret_key
-      ensure
-        `rm #{sdk_yaml_path}`
-      end
-    end
-
-    def test_meducation_sdk_gets_config_in_dev
-      sdk_yaml_path = File.expand_path('../../template/config/meducation-sdk.yml', __FILE__)
-      begin
-        optional_sdk_yaml_path = "#{sdk_yaml_path}.optional"
-        `cp #{optional_sdk_yaml_path} #{sdk_yaml_path}`
-        Configurator.configure(config_dir: config_dir, logfile: logfile)
-        assert_equal "LarvaSpawn", MeducationSDK.config.access_id
-        assert_equal "foobar", MeducationSDK.config.secret_key
-        assert_equal Filum.logger, MeducationSDK.config.logger
-        assert_equal "http://localhost:3000/spi", MeducationSDK.config.endpoint
-      ensure
-        `rm #{sdk_yaml_path}`
-      end
-    end
-
-    def test_meducation_sdk_gets_config_in_production
-      sdk_yaml_path = File.expand_path('../../template/config/meducation-sdk.yml', __FILE__)
-      begin
-        optional_sdk_yaml_path = "#{sdk_yaml_path}.optional"
-        `cp #{optional_sdk_yaml_path} #{sdk_yaml_path}`
-        Configurator.configure(config_dir: config_dir, logfile: logfile, env: 'production')
-        assert_equal "LarvaSpawn", MeducationSDK.config.access_id
-        assert_equal nil, MeducationSDK.config.secret_key
-        assert_equal Filum.logger, MeducationSDK.config.logger
-        assert_equal nil, MeducationSDK.config.endpoint
-      ensure
-        `rm #{sdk_yaml_path}`
-      end
-    end
-
     def test_propono_gets_config
       Configurator.configure(config_dir: config_dir, logfile: logfile)
       assert_equal "MY-DEV-ACCESS-KEY", Propono.config.access_key

data/test/mocker_test.rb

@@ -14,14 +14,6 @@ module Larva
       Mocker.mock!
     end
 
-    def test_loquor_is_setup
-      Mocker.mock!
-      assert_equal "http://localhost:3000/spi", MeducationSDK.config.endpoint
-      assert_equal "Daemon", MeducationSDK.config.access_id
-      assert_equal "foobar", MeducationSDK.config.secret_key
-      assert_equal Filum.logger, MeducationSDK.config.logger
-    end
-
     def test_propono_is_configured
       Mocker.mock!
       assert_equal Filum.logger, Propono.config.logger

data/test/test_helper.rb

@@ -9,31 +9,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "larva"
 
-module MeducationSDK
-  def self.config
-    @config ||= Struct.new(:access_id, :secret_key, :endpoint, :logger).new
-    if block_given?
-      yield @config
-    else
-      @config
-    end
-  end
-end
-
 class Minitest::Test
-
   def setup
-    Fog.mock!
     Filum.setup('log/test.log')
-    MeducationSDK.instance_variable_set(:@config, nil)
-    Propono.config do |config|
-      config.access_key = "test-access-key"
-      config.secret_key = "test-secret-key"
-      config.queue_region = "us-east-1"
-      config.application_name = "MyApp"
-      config.queue_suffix = nil
-
-      config.logger = Filum.logger
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: larva
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.0
 platform: ruby
 authors:
 - iHiD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: propono
@@ -130,6 +130,7 @@ files:
 - lib/larva/configuration.rb
 - lib/larva/configurator.rb
 - lib/larva/daemon.rb
+- lib/larva/daemon_creator.rb
 - lib/larva/listener.rb
 - lib/larva/message_replayer.rb
 - lib/larva/mocker.rb
@@ -142,16 +143,15 @@ files:
 - template/Rakefile
 - template/bin/larva_spawn
 - template/bin/larva_spawn-setup
-- template/config/meducation-sdk.yml.optional
 - template/config/propono.yml
 - template/lib/larva_spawn.rb
 - template/lib/larva_spawn/configuration.rb
 - template/lib/larva_spawn/daemon.rb
 - template/lib/larva_spawn/larva_spawn_error.rb
-- template/lib/larva_spawn/processors/media_file_processor.rb
+- template/lib/larva_spawn/processors/user_processor.rb
 - template/lib/tasks/larva_spawn.rake
 - template/test/daemon_test.rb
-- template/test/processors/media_file_processor_test.rb
+- template/test/processors/user_processor_test.rb
 - template/test/test_helper.rb
 - test/configuration_test.rb
 - test/configurator_test.rb
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Some Meducation specific helper files for ur pub/sub network
@@ -198,3 +198,4 @@ test_files:
 - test/processor_test.rb
 - test/test_helper.rb
 - test/worker_pool_test.rb
+has_rdoc: 

data/template/config/meducation-sdk.yml.optional

@@ -1,6 +0,0 @@
-development:
-  access_id: LarvaSpawn
-  secret_key: 'foobar'
-
-production:
-  access_id: LarvaSpawn

data/template/lib/larva_spawn/processors/media_file_processor.rb

@@ -1,15 +0,0 @@
-module LarvaSpawn
-  class MediaFileProcessor < Larva::Processor
-    def media_file_processed
-      do_one_thing
-      do_another_thing
-    end
-
-    private
-    def do_one_thing
-    end
-    def do_another_thing
-    end
-  end
-end
-

data/template/test/processors/media_file_processor_test.rb

@@ -1,12 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-module LarvaSpawn
-  class MediaFileProcessorTest < Minitest::Test
-    def test_issue_or_update_badges_called_for_correct_message
-      message = { entity: "media_file", action: "processed", media_file_id: 8 }
-      LarvaSpawn::MediaFileProcessor.any_instance.expects(:do_one_thing)
-      LarvaSpawn::MediaFileProcessor.any_instance.expects(:do_another_thing)
-      LarvaSpawn::MediaFileProcessor.process(message)
-    end
-  end
-end