localconfig 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e26ec55b463e0162a17d6fab1a6654ad99b6c75
-  data.tar.gz: b03ebd9c14f8a0a5b6ddc50bb8a947a81e821b8e
+  metadata.gz: 7fd04212aecdab757b1aa37c66c20ec31fe57a6c
+  data.tar.gz: 3e59657314b77fbff2777edf7569ffb6119f9c50
 SHA512:
-  metadata.gz: 8ffbf1f251062ece9f395b3dcc2ff0bbd047d5f6f4d807da5cac41dfac2cba56e1f1af3d3d411a4e9e2ac21ae2f5bbec91297e41da164680cc02ff047fa8462b
-  data.tar.gz: 0a4ce2810cb3f7ba03c4d35405c6a21010289b35dfad76a85b5cf784c5e91a554d2cdab0d547877e9256fb7fb4c2e7a5f4a7b0d3992bf6ee0cc8fbbbbe373b64
+  metadata.gz: 85e43f62c8d096c22234ee1935d36e744ee5ed7ff7a48bb45244aff0c220a798cfe661aabdf2e9f45aa27c427ba9de24eee9976fc00b3de2610352c07cc0ba74
+  data.tar.gz: f8438f461329489edfd3aefe46ee27820b280a0a4bbf32eb94f0a8dbe9655caddc60e2d7544bbaab7d84711cf1537276b544c87645f134357b7427ba7f564023

data/README.md

@@ -2,10 +2,10 @@
 
     File        : README.md
     Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-    Date        : 2014-10-22
+    Date        : 2014-10-30
 
     Copyright   : Copyright (C) 2014  Felix C. Stegerman
-    Version     : v0.3.1
+    Version     : v0.3.2
 
 []: }}}1
 

data/lib/localconfig/config.rb

@@ -2,7 +2,7 @@
 #
 # File        : localconfig/config.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2014-10-22
+# Date        : 2014-10-30
 #
 # Copyright   : Copyright (C) 2014  Felix C. Stegerman
 # Licence     : LGPLv3+
@@ -24,8 +24,7 @@ module LocalConfig
   # configuration
   class Config                                                  # {{{1
 
-    # something went wrong calling `system`
-    class RunError < StandardError; end
+    class Error < StandardError; end
 
     # dir
     attr_accessor :dir
@@ -148,22 +147,30 @@ module LocalConfig
     #
     # <!-- }}}2 -->
     def git_repo(path, url, opts = {})                          # {{{2
+      %w{ branch rev tag }.count { |x| opts.has_key? x.to_sym } <= 1 \
+        or raise ArgumentError,
+          "You can't use more than one of :rev, :tag, :branch"
       q       = opts.fetch(:quiet, true) ? %w{ --quiet } : []
+      s       = opts.fetch(:quiet, true) ?
+                  -> *a {                    _sys *a } :
+                  -> *a { puts "$ #{a*' '}"; _sys *a }
       b       = opts[:branch]; b = "origin/#{b}" if b && !b['/']
       rev     = opts[:rev] || opts[:tag]
       ref     = rev || b || 'origin/master'
       dest    = path path
       if File.exist? dest
         Dir.chdir(dest) do
-          _sys *(%w{ git fetch --force --tags } + q) \
+          _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 -- ]
         end
       else
-        _sys *(%w{ git clone } + q + [url, dest])
+        s[*(%w{ git clone } + q + [url, dest])]
       end
       Dir.chdir(dest) do
-        _sys *(%w{ git reset --hard } + q + [ref] + %w{ -- })
+        _git_dir_check
+        s[*(%w{ git reset --hard } + q + [ref] + %w{ -- })]
       end
     end                                                         # }}}2
 
@@ -198,10 +205,15 @@ module LocalConfig
       nil
     end                                                         # }}}2
 
+    # check for .git/
+    def _git_dir_check
+      File.exist? '.git/' or raise Error, 'not a git dir'
+    end
+
     # run!
     def _sys(cmd, *args)
       system([cmd, cmd], *args) or \
-        raise RunError, "failed to run command #{[cmd]+args} (#$?)"
+        raise Error, "failed to run command #{[cmd]+args} (#$?)"
     end
 
   end                                                           # }}}1

data/lib/localconfig/version.rb

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

data/spec/localconfig/config_spec.rb

@@ -2,7 +2,7 @@
 #
 # File        : localconfig/config_spec.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2014-10-21
+# Date        : 2014-10-30
 #
 # Copyright   : Copyright (C) 2014  Felix C. Stegerman
 # Licence     : LGPLv3+
@@ -60,9 +60,9 @@ describe lcc do
   end                                                           # }}}1
 
   context 'glob' do                                             # {{{1
-    it '* -> init.rb pg.json x.yaml' do
+    it '* -> bar foo init.rb pg.json' do
       expect(test1.glob('*').sort).to eq \
-        %w{ init.rb pg.json x.yaml }
+        %w{ bar foo init.rb pg.json }
     end
     it '*.json -> pg.json' do
       expect(test1.glob('*.json').sort).to eq %w{ pg.json }
@@ -87,12 +87,22 @@ describe lcc do
   end                                                           # }}}1
 
   context 'load_yaml' do                                        # {{{1
-    it 'loads x.yaml' do
-      x = test1.dup; x.load_yaml 'x.yaml'
-      expect(x.x.to_hash).to eq({ 'foo' => 99, 'bar' => 'hi!' })
+    it 'loads foo/x.yaml' do
+      x = test1.dup; x.load_yaml 'foo/x.yaml'
+      expect(x[:foo].x.to_hash).to eq({ 'foo' => 99, 'bar' => 'hi!' })
     end
   end                                                           # }}}1
 
+  context 'load_dir' do                                         # {{{1
+    it 'loads bar/y.yml' do
+      x = test1.dup; x.load_dir 'bar'
+      expect(x.bar.y.to_hash).to \
+        eq({ 'spam' => true, 'eggs' => false })
+    end
+  end                                                           # }}}1
+
+  # TODO: git_repo
+
 end
 
 # vim: set tw=70 sw=2 sts=2 et fdm=marker :

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: localconfig
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Felix C. Stegerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie