localconfig 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fd04212aecdab757b1aa37c66c20ec31fe57a6c
-  data.tar.gz: 3e59657314b77fbff2777edf7569ffb6119f9c50
+  metadata.gz: f1f47500d4493602aedc393fd4bcc262a7e96fb4
+  data.tar.gz: 25bba6b9bda29087ab830d5612c06b9cef3c3831
 SHA512:
-  metadata.gz: 85e43f62c8d096c22234ee1935d36e744ee5ed7ff7a48bb45244aff0c220a798cfe661aabdf2e9f45aa27c427ba9de24eee9976fc00b3de2610352c07cc0ba74
-  data.tar.gz: f8438f461329489edfd3aefe46ee27820b280a0a4bbf32eb94f0a8dbe9655caddc60e2d7544bbaab7d84711cf1537276b544c87645f134357b7427ba7f564023
+  metadata.gz: fe400e50bdcef853cd6e43572ec5fac537fbb173d83413bd1fa43f8dd03fc90c8c68cfbc19c3bd0595a58a5ca88f6f5aec3831d22a72daa586af39f9bc2fa534
+  data.tar.gz: 0325860c175d06b6c5fc9036c048c0ebcacf92d156cc46058a4a44840e19353c93b1d76dbf3874453f7e6c5d0fea867efa5606eb64c0efabcdc1af72b0969956

data/README.md

@@ -5,7 +5,7 @@
     Date        : 2014-10-30
 
     Copyright   : Copyright (C) 2014  Felix C. Stegerman
-    Version     : v0.3.2
+    Version     : v0.3.3
 
 []: }}}1
 
@@ -35,6 +35,8 @@
 ## Examples
 []: {{{1
 
+### Rails
+
 ```ruby
 # Gemfile
 gem 'localconfig', require: 'localconfig/rails'
@@ -48,6 +50,11 @@ LocalConfig['rails'].configure do |c|
   c.require 'init.rb'
 
   c.load_json 'pg.json'
+  puts c.pg.username
+
+  c.load_yaml 'foo/bar/baz.json'
+  puts c.foo.bar.baz.some_value
+
   c.load_yaml 'git.yml'   # repo:, branch:
   c.git_repo 'more', c.git.repo, branch: c.git.branch
   c.load_dir 'more'       # more/foo.yml, more/bar.json
@@ -62,12 +69,35 @@ LocalConfig['rails'].configure do |c|
 end
 ```
 
+### Standalone
+
+```ruby
+require 'localconfig'   # loads config/localconfig.rb
+```
+
+or:
+
+```ruby
+require 'localconfig/config'
+LocalConfig['foo'].configure do |c|
+  # ...
+end
+```
+
+### Rake
+
+```ruby
+require 'localconfig'
+ManifestDL::Rake.define_tasks
+```
+
 []: }}}1
 
 ## Specs & Docs
 
 ```bash
 rake spec
+rake coverage
 rake docs
 ```
 

data/Rakefile

@@ -13,6 +13,11 @@ task 'spec:less' do
   sh 'rspec -cfd --tty | less -R'
 end
 
+desc 'Run specs w/ coverage'
+task :coverage do
+  ENV['COVERAGE'] = 'yes'; Rake::Task['spec'].execute
+end
+
 desc 'Check for warnings'
 task :warn do
   reqs = %w{ config }.map { |x| "-r localconfig/#{x}" } * ' '
@@ -42,7 +47,7 @@ end
 
 desc 'Cleanup'
 task :clean do
-  sh 'rm -rf .yardoc/ doc/ *.gem'
+  sh 'rm -rf .yardoc/ coverage/ doc/ *.gem'
 end
 
 desc 'Build SNAPSHOT gem'

data/lib/localconfig/config.rb

@@ -34,9 +34,19 @@ module LocalConfig
 
     # set dir to ~/.apps, derive name
     def initialize(opts = {})
-      @config = {}
-      @dir    = opts[:dir] || "#{Dir.home}/.apps"
-      @name   = opts[:name] || derive_name
+                  # use Mash: has deep .dup
+      @config   = Hashie::Mash.new(opts[:config] || {})
+      @dir      = opts[:dir] || "#{Dir.home}/.apps"
+      @name     = opts[:name] || derive_name
+      @getters  = @config.keys.select { |x| !respond_to?(x) }
+      @getters.each { |x| define_singleton_method(x) { @config[x] } }
+    end
+
+    alias_method :_dup, :dup
+
+    # deep duplicate
+    def dup
+      self.class.new config: @config, dir: @dir.dup, name: @name.dup
     end
 
     # access setting by key
@@ -162,8 +172,7 @@ module LocalConfig
         Dir.chdir(dest) do
           _git_dir_check
           s[*(%w{ git fetch --force --tags } + q)] \
-            unless rev && %x[ git rev-parse HEAD ] ==
-                          %x[ git rev-parse --revs-only #{rev}^0 -- ]
+            unless rev && _git_rev('HEAD') == _git_rev(rev)
         end
       else
         s[*(%w{ git clone } + q + [url, dest])]
@@ -199,8 +208,10 @@ module LocalConfig
         pre.each { |x| o[x] ||= Hashie::Mash.new; o = o[x] }
         raise "self.#{(pre+[k])*'.'} already set" if o[k]
         o[k]    = Hashie::Mash.new parse[File.read(f[:path])]
-        define_singleton_method(c_k) { @config[c_k] } \
-          unless self.respond_to? c_k
+        unless respond_to? c_k
+          define_singleton_method(c_k) { @config[c_k] }
+          @getters << c_k
+        end
       end
       nil
     end                                                         # }}}2
@@ -216,6 +227,12 @@ module LocalConfig
         raise Error, "failed to run command #{[cmd]+args} (#$?)"
     end
 
+    # get hash for revision or tag
+    def _git_rev(rev)
+      hash = %x[ git rev-parse --revs-only #{rev}^0 -- 2>/dev/null ]
+      $?.success? ? hash.chomp : nil
+    end
+
   end                                                           # }}}1
 
   # --

data/lib/localconfig/version.rb

@@ -1,4 +1,4 @@
 module LocalConfig
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   DATE    = '2014-10-30'
 end

data/localconfig.gemspec

@@ -7,8 +7,6 @@ Gem::Specification.new do |s|
 
   s.description = <<-END.gsub(/^ {4}/, '')
     local configuration for ruby (web) apps
-
-    ...
   END
 
   s.version     = LocalConfig::VERSION
@@ -27,6 +25,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rake'
 
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov', '~> 0.9.0'  # TODO
+  s.add_development_dependency 'yard'
 
   s.required_ruby_version = '>= 1.9.1'
 end

data/spec/localconfig/config_spec.rb

@@ -11,8 +11,14 @@
 
 require 'localconfig/config'
 
+require 'fileutils'
+require 'tmpdir'
+
 lcc = LocalConfig::Config
 
+gist1 = 'https://gist.github.com/009eae662748f8778bed.git'
+gist2 = 'https://gist.github.com/80edcd5455d348f9ccb7.git'
+
 describe lcc do
 
   apps  = "#{Dir.pwd}/test/apps"
@@ -101,7 +107,62 @@ describe lcc do
     end
   end                                                           # }}}1
 
-  # TODO: git_repo
+  context 'git_repo' do                                         # {{{1
+    before(:all) do
+      @pwd = Dir.pwd; @dir = Dir.mktmpdir
+      FileUtils.mkdir_p "#{@dir}/foo"
+      FileUtils.mkdir_p "#{@dir}/apps/foo"
+      FileUtils.mkdir_p "#{@dir}/apps/foo/not_a_git_dir"
+      Dir.chdir "#{@dir}/foo"
+    end
+
+    before(:each) do
+      @lc = lcc.new dir: "#{@dir}/apps"
+    end
+
+    after(:all) do
+      Dir.chdir @pwd; FileUtils.remove_entry_secure @dir
+    end
+
+    it 'clones (& .branch is OK)' do
+      @lc.git_repo 'lc_gist', gist1
+      @lc.load_dir 'lc_gist'
+      expect(@lc.lc_gist.foo.to_hash) .to \
+        eq({ 'x' => 42, 'y' => 37 })
+      expect(@lc.lc_gist.bar.to_hash) .to \
+        eq({ 'spam' => true, 'eggs' => false })
+      expect(@lc.lc_gist.baz.to_hash) .to \
+        eq({ 'answer' => 42 })
+      Dir.chdir("#{@dir}/apps/foo/lc_gist") do
+        expect(LocalConfig.branch).to eq('master')
+      end
+    end
+    it 'resets' do
+      @lc.git_repo 'lc_gist', gist1, rev: 'ba232fd'
+      @lc.load_dir 'lc_gist'
+      expect(@lc.lc_gist.foo.to_hash) .to \
+        eq({ 'x' => 42, 'y' => 99 })
+    end
+    it 'fetches' do
+      Dir.chdir("#{@dir}/apps/foo/lc_gist") do
+        system *(%w{ git remote set-url origin } + [gist2]) \
+          or raise 'OOPS'
+      end
+      @lc.git_repo 'lc_gist', gist2, tag: 'tag_2'
+      @lc.load_dir 'lc_gist'
+      expect(@lc.lc_gist.foo.to_hash) .to \
+        eq({ 'x' => 42, 'y' => 37, 'z' => true })
+    end
+    it 'complains w/ tag + branch' do
+      expect { @lc.git_repo 'dummy', gist1, tag: 'foo', branch: 'bar' } \
+        .to raise_error(ArgumentError,
+          "You can't use more than one of :rev, :tag, :branch")
+    end
+    it 'complains w/o .git' do
+      expect { @lc.git_repo 'not_a_git_dir', gist1 } \
+        .to raise_error(lcc::Error, 'not a git dir')
+    end
+  end                                                           # }}}1
 
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+if ENV['COVERAGE'] == 'yes'
+  require 'simplecov'
+  SimpleCov.start
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localconfig
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Felix C. Stegerman
@@ -52,10 +52,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   local configuration for ruby (web) apps
-
-  ...
 email:
 - flx@obfusk.net
 executables: []
@@ -73,6 +99,7 @@ files:
 - lib/localconfig/version.rb
 - localconfig.gemspec
 - spec/localconfig/config_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/obfusk/rb-localconfig
 licenses:
 - LGPLv3+