merlin 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 693debc958ce4d513f5fa407075ac12802629b28
+  data.tar.gz: 00cb8ab9c9f0c830879ed55fe666ce8bcd676485
+SHA512:
+  metadata.gz: 6f4503fff50adc805680414d95883093859a5e99b6ea2a32bd3d17f757022513a50f488b192b9bfe149b442610e57fafb0d867be5c8797484b898dbf06719ff3
+  data.tar.gz: 35a383d3bd9463a9961daedbb04abfe711b885da9a907b8f7727401244cf9ceb0ea28761765520bd69c2fad85103f7533524898f46bb481003c3400ede7d056d

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Badger'
+  rdoc.title    = 'Merlin'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/{app/models → lib}/merlin/configuration.rb

@@ -1,11 +1,37 @@
 require 'yaml'
+require 'faraday'
+require 'faraday_middleware'
+require 'deep_merge' unless {}.respond_to?(:deep_merge)
+require 'ostruct'
+require 'json'
+require 'logger'
+
+class OpenStruct
+  def to_json
+    table.to_json
+  end
+
+  def self.deep(obj, freeze = false)
+    case obj
+    when Array
+      obj.map {|e| OpenStruct.deep(e, freeze)}
+    when Hash
+      OpenStruct.new(obj.each do |k,v|
+        obj[k] = OpenStruct.deep(v, freeze)
+      end)
+    else
+      obj
+    end.tap { |res| res.freeze if freeze }
+  end
+end
 
 module Merlin
   class Configuration
     attr_reader :raw
 
-    def initialize(config_file_path, environment = ::Rails.env, connection = nil)
+    def initialize(config_file_path, environment, logger = Logger.new(STDOUT), connection = nil)
       @environment = environment
+      @logger = logger
       @local_raw = from_file(config_file_path)
       @remote_raw = merlin_server ? from_server(connection) : {}
       @raw = @remote_raw.deep_merge(@local_raw)
@@ -45,10 +71,13 @@ module Merlin
     end
 
     def production_or_staging
-      ["production", "staging"].include?(::Rails.env)
+      ["production", "staging"].include?(@environment)
     end
 
     def dump_config(config)
+      tmp_dir = "tmp"
+      dump_filepath = File.join(tmp_dir, "merlin_offline_dump.yml")
+      FileUtils.mkdir(tmp_dir) unless File.exist?(tmp_dir) && File.directory?(tmp_dir)
       File.open(dump_filepath, "w") { |file| file.puts(YAML.dump(config)) }
     end
 
@@ -59,14 +88,10 @@ module Merlin
 
     def print_message(message)
       merlin_message = "MERLIN: #{message}"
-      Rails.logger.warn(merlin_message)
+      @logger.warn merlin_message
       puts merlin_message
     end
 
-    def dump_filepath
-      File.join(::Rails.root, "tmp", "merlin_offline_dump.yml")
-    end
-
     def merlin_server
       @local_raw['merlin']
     end

data/lib/merlin/version.rb

@@ -1,3 +1,3 @@
 module Merlin
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/merlin.rb

@@ -1,8 +1,24 @@
-require "merlin/engine"
-require "merlin/webmock" if Rails.env.test?
+require "merlin/configuration"
+require "merlin/version"
 
 module Merlin
+  
   def self.method_missing(*args, &block)
-    @configuration.send(*args, &block)
+    logger = @logger || Logger.new(STDOUT)
+    raise "Missing configuration path -> Merlin.config_path = '...'" unless @config_path
+    raise "Missing environment -> Merlin.env = :production" unless @env
+    Merlin::Configuration.new(@config_path, @env, logger).send(*args, &block)
+  end
+
+  def self.config_path=(path)
+    @config_path = path  
+  end
+
+  def self.env=(env)
+    @env = env
+  end
+
+  def self.logger=(logger)
+    @logger = logger
   end
 end

metadata

@@ -1,110 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: merlin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Artur Roszczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Client for merlin-server
@@ -114,46 +87,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/merlin/application.js
-- app/assets/stylesheets/merlin/application.css
-- app/controllers/merlin/application_controller.rb
-- app/helpers/merlin/application_helper.rb
-- app/models/merlin/configuration.rb
-- app/views/layouts/merlin/application.html.erb
-- config/routes.rb
-- lib/merlin/engine.rb
+- lib/merlin/configuration.rb
 - lib/merlin/version.rb
-- lib/merlin/webmock.rb
 - lib/merlin.rb
-- lib/ostruct/deep.rb
-- lib/ostruct/extensions.rb
-- lib/ostruct/to_json.rb
 - lib/tasks/merlin_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.md
 homepage: http://github.com/sevos/merlin
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: App configuration made simple
 test_files: []
+has_rdoc: 

data/app/assets/javascripts/merlin/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/app/assets/stylesheets/merlin/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */

data/app/controllers/merlin/application_controller.rb

@@ -1,4 +0,0 @@
-module Merlin
-  class ApplicationController < ActionController::Base
-  end
-end

data/app/helpers/merlin/application_helper.rb

@@ -1,4 +0,0 @@
-module Merlin
-  module ApplicationHelper
-  end
-end

data/app/views/layouts/merlin/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Merlin</title>
-  <%= stylesheet_link_tag    "merlin/application", :media => "all" %>
-  <%= javascript_include_tag "merlin/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/config/routes.rb

@@ -1,2 +0,0 @@
-Merlin::Engine.routes.draw do
-end

data/lib/merlin/engine.rb

@@ -1,25 +0,0 @@
-module Merlin
-  class Engine < ::Rails::Engine
-    isolate_namespace Merlin
-
-    require 'yaml'
-    require 'ostruct/extensions'
-    require 'faraday'
-    require 'faraday_middleware'
-
-    config.generators do |g|
-      g.test_framework :rspec, fixture: false, view_specs: false,
-                               request_specs: false, routing_specs: false
-      g.template_engine false
-      g.stylesheets false
-      g.javascripts false
-      g.helper false
-    end
-
-    initializer 'merlin.load_config', :before => :load_config_initializers do |app|
-      Merlin.instance_eval do
-        @configuration = Merlin::Configuration.new(File.join(::Rails.root, 'config', 'merlin.yml'))
-      end
-    end
-  end
-end

data/lib/merlin/webmock.rb

@@ -1,6 +0,0 @@
-begin
-  require 'webmock'
-  WebMock.allow_net_connect!
-rescue LoadError
-  nil
-end

data/lib/ostruct/deep.rb

@@ -1,14 +0,0 @@
-require 'ostruct'
-
-def OpenStruct.deep(obj, freeze = false)
-  case obj
-  when Array
-    obj.map {|e| OpenStruct.deep(e, freeze)}
-  when Hash
-    OpenStruct.new( obj.each do |k,v|
-      obj[k] = OpenStruct.deep(v, freeze)
-    end )
-  else
-    obj
-  end.tap { |res| res.freeze if freeze }
-end

data/lib/ostruct/extensions.rb

@@ -1,2 +0,0 @@
-require 'ostruct/deep'
-require 'ostruct/to_json'

data/lib/ostruct/to_json.rb

@@ -1,7 +0,0 @@
-require 'ostruct'
-
-class OpenStruct
-  def to_json
-    table.to_json
-  end
-end