state_mate 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48fd4c0c71a34bcd84727dca505091aebfa44981
-  data.tar.gz: 2e6cab4f5cd7c579b238175d498cec2a7801d268
+  metadata.gz: 5aba1e0cd11231bc25d168f117aab8cf89056f3b
+  data.tar.gz: 3c1bb3640ca889f7a5b19ed4530b2093dec734d5
 SHA512:
-  metadata.gz: 60f3b23aac04175f0cae6ddc32fbae4ab32ae5d58fe36a6a7de5da733202ef7d3792e4ba540dea3f66b4b1cb1c1d9ccd190f2ec434848270b95c30302d6114bd
-  data.tar.gz: a44733da28c6f8ba4542142be71673af07b2c7e35dc89cf14994421b5abf61624efb2d33fc9acf705dbc4cf5479dd7fbd9b3e10730433b55237f35491dbf0be7
+  metadata.gz: e4c92a705ec2c6e6c62a887d0b0023ea69cdff660d01fde5ffbbcae8eaed2fc88d878b3f21686437ff07814beb5b99564a2dbcb74fe289920c93d31e3dceef90
+  data.tar.gz: 2bf7d8f08317ca320acc21296791e8b3f92d165faf9c0161354c7cec8c9576d8896bf4eba7d6ff0c28af32f7ced6e1d180acd6906b0e07bc557e9f0763493b73

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # use local
-# gem 'nrser', '~> 0.0', :path => '../nrser-ruby'
+# gem 'nrser', '0.0.13.dev', :path => '../nrser-ruby'
 
 # Specify your gem's dependencies in state_mate.gemspec
 gemspec

data/lib/state_mate/adapters/defaults.rb

@@ -515,12 +515,15 @@ module StateMate::Adapters::Defaults
   #     
   # @return nil
   #
-  def self.basic_delete domain, key, current_host    
-    Cmds! '%{cmd} %{current_host?} delete %{domain} %{key?}',
+  def self.basic_delete domain, key, current_host
+    sudo = domain.start_with?('/Library') ? "sudo" : nil
+    
+    Cmds! '%{sudo?} %{cmd} %{current_host?} delete %{domain} %{key?}',
           cmd: DEFAULTS_CMD,
           current_host: (current_host ? '-currentHost' : nil),
           domain: domain,
-          key: (key ? key : nil)
+          key: (key ? key : nil),
+          sudo: sudo
     
     nil
   end
@@ -549,12 +552,15 @@ module StateMate::Adapters::Defaults
     if value.nil?
       basic_delete(domain, key, current_host)
     else
-      Cmds! '%{cmd} %{current_host?} write %{domain} %{key?} %{xml}',
+      sudo = domain.start_with?('/Library') ? "sudo" : nil
+      
+      Cmds! '%{sudo?} %{cmd} %{current_host?} write %{domain} %{key?} %{xml}',
             cmd: DEFAULTS_CMD,
             current_host: (current_host ? '-currentHost' : nil),
             domain: domain,
             key: (key ? key : nil),
-            xml: to_xml_element(value).to_s
+            xml: to_xml_element(value).to_s,
+            sudo: sudo
     end
     
     nil

data/lib/state_mate/adapters/launchd.rb

@@ -3,7 +3,6 @@ require 'pp'
 require 'CFPropertyList'
 
 require 'nrser'
-require 'nrser/exec'
 
 require 'state_mate'
 require 'state_mate/adapters/defaults'
@@ -36,7 +35,7 @@ module StateMate::Adapters::LaunchD
     if user == 'root'
       "/var/db/launchd.db/com.apple.launchd/overrides.plist"
     else
-      user_id = NRSER::Exec.run("id -u %{user}", user: user).chomp.to_i
+      user_id = Cmds!("id -u %{user}", user: user).out.chomp.to_i
       "/var/db/launchd.db/com.apple.launchd.peruser.#{ user_id }/overrides.plist"
     end
   end
@@ -53,13 +52,7 @@ module StateMate::Adapters::LaunchD
   end
 
   def self.loaded? label
-    begin
-      NRSER::Exec.run "%{exe} list -x %{label}", exe: EXE, label: label
-    rescue SystemCallError => e
-      false
-    else
-      true
-    end
+      Cmds.ok? "%{exe} list -x %{label}", exe: EXE, label: label
   end
 
   def self.parse_key key
@@ -68,13 +61,13 @@ module StateMate::Adapters::LaunchD
   end
 
   def self.load file_path
-    NRSER::Exec.run "%{exe} load -w %{file_path}",  exe: EXE,
-                                                    file_path: file_path
+    Cmds! "%{exe} load -w %{file_path}",  exe: EXE,
+                                          file_path: file_path
   end
 
   def self.unload file_path
-    NRSER::Exec.run "%{exe} unload -w %{file_path}",  exe: EXE,
-                                                      file_path: file_path
+    Cmds! "%{exe} unload -w %{file_path}",  exe: EXE,
+                                            file_path: file_path
   end
 
   def self.read key, options = {}
@@ -114,4 +107,4 @@ module StateMate::Adapters::LaunchD
       raise "unprocessable key: #{ key.inspect }"
     end
   end
-end # LaunchD
+end # LaunchD

data/lib/state_mate/version.rb

@@ -1,3 +1,3 @@
 module StateMate
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/state_mate.rb

@@ -1,5 +1,8 @@
 require 'set'
 require 'nrser'
+require 'nrser/refinements'
+
+using NRSER
 
 require "state_mate/version"
 
@@ -164,7 +167,7 @@ module StateMate
                                         state.options
         rescue Exception => e
           @new_value_error = e
-          raise Error::ValueChangeError.new tpl binding, <<-BLOCK
+          raise Error::ValueChangeError.new binding.erb <<-BLOCK
             an error occured when changing a values:
 
             <%= @new_value_error.format %>
@@ -184,7 +187,7 @@ module StateMate
         rescue Exception => e
           @write_error = e
           rollback
-          raise Error::WriteError.new tpl binding, <<-BLOCK
+          raise Error::WriteError.new binding.erb <<-BLOCK
             an error occured when writing new state values:
 
             <%= @write_error.format %>
@@ -250,8 +253,8 @@ module StateMate
       StateMate::Adapters.constants.find {|sym|
         sym.to_s.downcase == adapter_name.gsub('_', '')
       }.pipe {|sym| StateMate::Adapters.const_get sym}
-    rescue
-      raise "can't find adapter #{ adapter_name.inspect }"
+    rescue Exception => e
+      raise "can't find adapter #{ adapter_name.inspect }: #{ e }"
     end
   end
 

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'state_mate'
 
 DOMAIN = 'com.nrser.state_mate'
 
+class MockError < StandardError; end
+
 shared_context "#{ DOMAIN } empty" do
   before(:each) {
     `defaults delete #{ DOMAIN } 2>&1 > /dev/null`

data/spec/state_mate/execute_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'state_mate'
+
+describe "StateMate::execute" do
+  context "defaults" do
+    include_context "#{ DOMAIN } empty"
+    
+    it "writes a basic value" do
+      StateMate.execute({
+        'defaults' => {
+          'key' => [DOMAIN, 'x'],
+          'set' => 'ex',
+        },
+      })
+
+      expect_defaults_read 'x', eq('ex'), 'string'
+    end
+  end # context defaults
+    
+  context "write failure" do
+    include_context "#{ DOMAIN } empty"
+    
+    it "raises StateMate::Error::WriteError" do
+      allow(StateMate::Adapters::Defaults).to receive(:write) do
+        raise MockError.new
+      end
+      
+      expect {
+        StateMate.execute({
+          'defaults' => {
+            'key' => [DOMAIN, 'x'],
+            'set' => 'ex',
+          },
+        })
+      }.to raise_error StateMate::Error::WriteError
+
+    end # it raises StateMate::Error::WriteError
+  end # context write failure
+end

data/state_mate.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   spec.add_development_dependency "redcarpet"
   
-  spec.add_dependency 'nrser', '~> 0.0.12'
+  spec.add_dependency 'nrser', '>= 0.0.13'
   spec.add_dependency 'CFPropertyList', '~> 2.3'
-  spec.add_dependency 'cmds', '~> 0.0.6'
+  spec.add_dependency 'cmds', '>= 0.0.7'
 end

data/test/bin/install.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+# build and install gem from current source
+
+require 'pathname'
+require 'fileutils'
+require 'cmds'
+
+sudo = Cmds("rbenv version").out.start_with?("system") ? 'sudo' : nil
+
+ROOT = Pathname.new(__FILE__).dirname.join("..", "..").expand_path
+
+Cmds.stream "%{sudo?} gem uninstall state_mate", sudo: sudo
+
+Dir.chdir ROOT do
+  Dir["./*.gem"].each {|fn| FileUtils.rm fn}
+  Cmds.stream "gem build state_mate.gemspec"
+end
+
+Cmds.stream "%{sudo?} gem install %{path}",
+  path: Dir[ROOT + "*.gem"].first,
+  sudo: sudo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_mate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - nrser
@@ -14,114 +14,114 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   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'
 - !ruby/object:Gem::Dependency
   name: nrser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: cmds
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: 
 email:
 - neil@ztkae.com
@@ -129,10 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -158,6 +157,7 @@ files:
 - spec/state_mate/adapters/git_config/write_spec.rb
 - spec/state_mate/adapters/json/read_spec.rb
 - spec/state_mate/adapters/json/write_spec.rb
+- spec/state_mate/execute_spec.rb
 - spec/state_mate_spec.rb
 - state_mate.gemspec
 - test/ansible/ansible.cfg
@@ -166,6 +166,7 @@ files:
 - test/ansible/play
 - test/ansible/playbook.yml
 - test/ansible/read
+- test/bin/install.rb
 homepage: https://github.com/nrser/state_mate
 licenses:
 - MIT
@@ -176,17 +177,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: i heard it's meant to help you with your state, mate!
@@ -202,6 +203,7 @@ test_files:
 - spec/state_mate/adapters/git_config/write_spec.rb
 - spec/state_mate/adapters/json/read_spec.rb
 - spec/state_mate/adapters/json/write_spec.rb
+- spec/state_mate/execute_spec.rb
 - spec/state_mate_spec.rb
 - test/ansible/ansible.cfg
 - test/ansible/clear
@@ -209,4 +211,5 @@ test_files:
 - test/ansible/play
 - test/ansible/playbook.yml
 - test/ansible/read
+- test/bin/install.rb
 has_rdoc: 

data/.ruby-version

@@ -1 +0,0 @@
-system