kefir 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d8742a055b653495c9e655d9469c0ecbd1894a
-  data.tar.gz: 095c8d016e1d849c91f5556497cc755978777768
+  metadata.gz: bcea3ed21f0ba7fe31416b37b53786d25aaf13e9
+  data.tar.gz: bfd8a92a87f778b27c4664a10d93908aa7fe6222
 SHA512:
-  metadata.gz: c3ce4f0d0abcc83bc1a3b22ed3a70b3ece3b9cb2d79062340dac8a89d0699c4adb8f9b92d04e5eda025dc4cb013179bb4ab88d7abc9f5c0b8d438a12a25c5175
-  data.tar.gz: 8a38019191d5ce6264e3b327b53ae30a159efb5cfca9e3617ed97ee284aefd2ec93e5773c976021ee86406cf2b4ed8c57edc500ec811cc2ca6530b1bc637b6cf
+  metadata.gz: 8eeb38996768205b6aeb63dbd484c0f0568ab6a9e37db182141a6fe350eadaccc4e542adf62ec275ac9b3b85b3a332758b1622ea762bf466a48331837ffa8b75
+  data.tar.gz: ad213f47117c01e9f56a132c9be97483f33e04e1dddd9a57fd7e99d1584e7e503f92c719eb025c1337cdf0386592189374c6626c9c761140034b82287c2735c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kefir (1.0.0)
+    kefir (1.0.1)
       dig_rb (~> 1.0, >= 1.0.1)
       env_paths (~> 0.0.2)
 

data/lib/kefir/file_store.rb

@@ -2,17 +2,20 @@ module Kefir
   class FileStore
     attr_reader :path
 
-    def initialize(config_file_path)
-      @path = config_file_path
+    def initialize(options = {})
+      @dir = options[:cwd]
+      @path = File.expand_path(options[:config_name], @dir)
     end
 
     def read
-      File.read(@path) do |contents|
-        YAML.load(contents)
-      end
+      FileUtils.mkdir_p(@dir)
+      YAML.load_file(@path) || {}
+    rescue Errno::ENOENT
+      {}
     end
 
     def write(data)
+      FileUtils.mkdir_p(@dir)
       File.write(@path, YAML.dump(data))
     end
   end

data/lib/kefir/version.rb

@@ -1,3 +1,3 @@
 module Kefir
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/kefir.rb

@@ -1,4 +1,5 @@
 require 'dig_rb'
+require 'fileutils'
 require 'env_paths'
 require 'yaml'
 require 'kefir/version'
@@ -16,7 +17,7 @@ module Kefir
     raise MissingNamespaceError, 'You must supply a namespace for your configuration files' if namespace.nil? || namespace.empty?
 
     parsed_options = parse_options(namespace, options)
-    store = FileStore.new(parsed_options[:config_file_path])
+    store = FileStore.new(parsed_options)
 
     Config.new(store, options)
   end
@@ -25,9 +26,7 @@ module Kefir
 
   def self.parse_options(namespace, options)
     parsed = DEFAULT_OPTIONS.merge(options)
-    cwd = parsed.fetch(:cwd, EnvPaths.get(namespace).config)
-    parsed[:config_file_path] = File.expand_path(parsed[:config_name], cwd)
-
+    parsed[:cwd] = parsed.fetch(:cwd, EnvPaths.get(namespace).config)
     parsed
   end
 end

data/spec/kefir/config_spec.rb

@@ -1,5 +1,7 @@
 RSpec.describe Kefir::Config do
-  let(:store_double) { double(Kefir::FileStore, read: {}, write: nil) }
+  let(:store_double) do
+    double(Kefir::FileStore, read: {}, write: nil, path: 'custom_path')
+  end
   let(:config) { Kefir::Config.new(store_double, {}) }
 
   describe 'initialize' do
@@ -74,7 +76,7 @@ RSpec.describe Kefir::Config do
 
   describe 'path' do
     it 'returns the path of its store' do
-      store =  double(Kefir::FileStore, path: '/config/path')
+      store = double(Kefir::FileStore, path: '/config/path')
       config = Kefir::Config.new(store, {})
 
       expect(config.path).to eq('/config/path')

data/spec/kefir/file_store_spec.rb

@@ -1,6 +1,12 @@
 RSpec.describe Kefir::FileStore do
-  let(:data) { { secret: 'dont tell', users: [{ name: 'bob' }, { name: 'jane' }] } }
-  let(:file_path) { File.join(@temp_dir, 'config') }
+  let(:data) do
+    {
+      secret: 'dont tell',
+      users: [{ name: 'bob' }, { name: 'jane' }]
+    }
+  end
+
+  let(:file_path) { File.join(@temp_dir, 'config.yml') }
 
   before(:each) do
     @temp_dir = Dir.mktmpdir
@@ -10,9 +16,14 @@ RSpec.describe Kefir::FileStore do
     FileUtils.remove_dir(@temp_dir)
   end
 
+  it 'gives its path' do
+    store = Kefir::FileStore.new(cwd: @temp_dir, config_name: 'config.yml')
+    expect(store.path).to eq(File.join(@temp_dir, 'config.yml'))
+  end
+
   it 'reads a configuration file' do
     File.write(file_path, YAML.dump(data))
-    Kefir::FileStore.new(file_path)
+    Kefir::FileStore.new(cwd: @temp_dir, config_name: 'config.yml')
     parsed = YAML.load_file(file_path)
 
     expect(parsed).to eq(
@@ -26,8 +37,7 @@ RSpec.describe Kefir::FileStore do
 
   it 'writes to a configuration file' do
     File.write(file_path, YAML.dump(data))
-    store = Kefir::FileStore.new(file_path)
-
+    store = Kefir::FileStore.new(cwd: @temp_dir, config_name: 'config.yml')
     store.write(data.merge(secret: 'changed'))
 
     parsed = YAML.load_file(file_path)
@@ -40,4 +50,39 @@ RSpec.describe Kefir::FileStore do
       ]
     )
   end
+
+  it 'returns an empty hash when file is empty' do
+    FileUtils.touch(file_path)
+    store = Kefir::FileStore.new(cwd: @temp_dir, config_name: 'config.yml')
+    expect(store.read).to eq({})
+  end
+
+  it 'creates nonexistant directories' do
+    nonexistant_path = File.join(@temp_dir, 'cool/beans')
+    Kefir::FileStore.new(
+      cwd: nonexistant_path,
+      config_name: 'config.yml'
+    ).read
+    expect(File.directory?(nonexistant_path)).to eq(true)
+  end
+
+  it 'returns an empty hash when reading nonexistant files' do
+    store = Kefir::FileStore.new(
+      cwd: @temp_dir,
+      config_name: 'config.yml'
+    )
+
+    expect(store.read).to eq({})
+  end
+
+  it 'succesfully writes to nonexistant files' do
+    store = Kefir::FileStore.new(
+      cwd: @temp_dir,
+      config_name: 'config.yml'
+    )
+
+    store.write(foo: 'bar')
+
+    expect(YAML.load_file(File.join(@temp_dir, 'config.yml'))).to eq(foo: 'bar')
+  end
 end

data/spec/kefir_spec.rb

@@ -13,7 +13,8 @@ RSpec.describe Kefir do
     end
 
     it 'returns a fully functioning config object that can read config' do
-      allow(File).to receive(:read).and_yield("user: bob\napi_key: secret-value")
+      allow(File).to receive(:directory?).and_return(true)
+      allow(YAML).to receive(:load_file).and_return('user' => 'bob')
 
       config = Kefir.config('test')
 
@@ -21,7 +22,8 @@ RSpec.describe Kefir do
     end
 
     it 'returns a fully functioning config object that can write config' do
-      allow(File).to receive(:read).and_yield("user: bob\napi_key: secret-value")
+      allow(File).to receive(:directory?).and_return(true)
+      allow(YAML).to receive(:load_file).with(/config\.yml$/).and_return(false)
       expect(File).to receive(:write)
 
       config = Kefir.config('test')
@@ -30,14 +32,16 @@ RSpec.describe Kefir do
 
     context 'options' do
       it 'provides defaults' do
-        expect(File).to receive(:read).with(/config\.yml$/).and_yield("user: bob\napi_key: secret-value")
+        allow(File).to receive(:directory?).and_return(true)
+        expect(YAML).to receive(:load_file).with(/config\.yml$/).and_return(false)
         config = Kefir.config('test')
         config.get(:foo)
       end
 
       it 'allows overriding current directory' do
         custom_cwd = File.expand_path('custom/path', '/')
-        expect(File).to receive(:read).with(File.join(custom_cwd, 'config.yml')).and_yield("user: bob\napi_key: secret-value")
+        allow(File).to receive(:directory?).and_return(true)
+        expect(YAML).to receive(:load_file).with(File.join(custom_cwd, 'config.yml')).and_return(false)
 
         config = Kefir.config('test', cwd: custom_cwd)
         config.get(:foo)
@@ -45,7 +49,8 @@ RSpec.describe Kefir do
 
       it 'allows overriding the :config_name' do
         custom_cwd = File.expand_path('custom/path', '/')
-        expect(File).to receive(:read).with(File.join(custom_cwd, 'custom_config_name.yml')).and_yield("user: bob\napi_key: secret-value")
+        allow(File).to receive(:directory?).and_return(true)
+        expect(YAML).to receive(:load_file).with(File.join(custom_cwd, 'custom_config_name.yml')).and_return(false)
 
         config = Kefir.config('test', cwd: custom_cwd, config_name: 'custom_config_name.yml')
         config.get(:foo)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kefir
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nick Tomlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: env_paths