cabi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a56f6e6e8ee48ba38ba8f60099907e4c1d9c700
-  data.tar.gz: 484d80e55fc096a324dd0667b2f5d515e2b12af6
+  metadata.gz: ee85570e4d09d5212cdd2987e00f584522ce5a15
+  data.tar.gz: 720e2a6061641df78035b8bc576460fac1f0a52c
 SHA512:
-  metadata.gz: 6eeedec5d3f8db0fdd66e428910225990acfda42f93f9281e29c732c5064da64b217b54c82bd67cf9d20d7c771959e011a6b2f83c3043786976e56833adfc911
-  data.tar.gz: 9ab42f192d38f94e8b4fd5c0e33e6d4f0b7f0505e839d3234158926c8963ae560ab64ad60c0bfaf87597dd9134e20f261717c7ac56ceca926a56a7cf50454519
+  metadata.gz: 357e04fc69b7accafb5c53e7a8df59af0f7905a3526910db1f3d13c9001c872aa9de83b453ca170963cfb53b932aafad3bc419f21cd358dc7dbfc95d63e76b39
+  data.tar.gz: 60865bf4a8e4db0a4ec30d52080f92d1210108d125efa768ae806fe6de017fcd10182203aa375d49f847c18bdc8b00e982e14affb34ae85ede1645c5387bae07

data/README.md

@@ -60,7 +60,9 @@ Cabi.read('**/*').length                      # 9
 
 # Selection within YAML files
 Cabi.read('pages:about:meta:foo:bar')         # contents of ['foo']['bar'] in page/about/meta.yml hash
+Cabi.read('pages:about:meta.yml:foo:bar')     # same as above
 Cabi.read('info:foo:bar:baz')                 # contents of ['foo']['bar']['baz'] in info.yml hash
+Cabi.read('info.yml:foo:bar:baz')             # same as above
 ```
 
 ### Custom Data Directory

data/bin/cabi

@@ -6,6 +6,9 @@ require File.join( File.expand_path("../..", __FILE__), "lib", "cabi")
 
 class CabiCLI < Thor
 
+  # -----------------------------------------------------------------------------------------------------------
+  # Init Task
+  # -----------------------------------------------------------------------------------------------------------
   desc "init", "Initialize Cabi data directory (use --mock to create fake data, use --target to specify your own directory)"
   method_options :mock => :boolean, :target => :string
   def init
@@ -18,22 +21,34 @@ class CabiCLI < Thor
       `tar -xf #{f} --strip-components=1 -C #{target}`
     end
 
-    puts " ** Cabi data created in #{target}"
+    puts "** Cabi data created in #{target}"
   end
 
+  # -----------------------------------------------------------------------------------------------------------
+  # Clean Task
+  # -----------------------------------------------------------------------------------------------------------
   desc "clean", "Remove Cabi data directory"
   method_options :force => :boolean  
   def clean
-    if options[:force]
-      begin
-        FileUtils.rm_rf( Cabi.data_dir )
-        FileUtils.rm_rf( Cabi::CABI_DATA_DIR)
-        puts " ** Cleaned cabi data" 
-      rescue Exception => e
-      end
+    puts "\n** Trying to clean Cabi data folder." 
+
+    current_dir = File.expand_path(Dir.pwd) == Cabi.data_dir({ quiet: true })
+
+    if current_dir
+      puts "** Cabi data folder is the same as the current folder -- not cleaning!" 
     else
-      puts " ** Not cleaning cabi data folder without --force" 
+      if options[:force]
+        begin
+          FileUtils.rm_rf( Cabi.data_dir )
+          puts " ** Cleaned cabi data" 
+        rescue Exception => e
+        end
+      else
+        puts "** Not cleaning cabi data folder without --force" 
+      end
     end
+
+
   end
 
 end

data/cabi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = 'cabi'
-  s.version               = '0.1.4'
+  s.version               = '0.1.5'
   s.summary               = "A simple, flat-file datastore for Ruby."
           
   s.description           = "Cabi is a flat-file datastore where data is stored by directory stucture and accessed by colon-delimited strings."

data/lib/data.rb

@@ -29,10 +29,13 @@ module Cabi
   end
 
   # Helpers for setting/getting data dir.
-  def self.data_dir
+  def self.data_dir(opts={})
     dir             = Data.user_data_dir || CABI_DATA_DIR
     @@data_dir      = File.expand_path(dir)
-    raise LoadError.new "Could not find cabi data folder!" unless File.exists? @@data_dir
+
+    return nil                                              if !File.exists?(@@data_dir) and opts[:quiet]
+    raise LoadError.new "Could not find cabi data folder!"  if !File.exists? @@data_dir
+
     @@data_dir
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cabi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Brian Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor