qb 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d6098e280b9b7d81dbbf61d2ded63240cbbc82
-  data.tar.gz: 2b24e1ce4f95cb7028d0db244a8441227fbfc8e1
+  metadata.gz: 6eb975b210be08ce0337c76edfd3206c3182b7f3
+  data.tar.gz: e33159e190cb5562a43c3cedd7c30e1179ee7a0e
 SHA512:
-  metadata.gz: 19ce871a0b7e8e43ed1e0d105cb9bcc89205af709dfa712b552d040a74ca48b432c34280749caa028b71d66c23d3b99f97322fa038064c040c80fab2e43ba3fd
-  data.tar.gz: 56a79b341ae740a8d4e75d42a8af92b1e019a819b326ea8f7f6c3bc3b9f419f7b5f6f317c3563ebc1fa9e0763cfebcc6eb9589fa448ae1793f9f0685ade7e7a3
+  metadata.gz: 741b549e8146722b757941e5c3afd9dc9d67ed889ddd8d455038e18d8dd651fdd6e98003338fa1a277087fd1835d9b447be37d06868db112a1da853491a30af6
+  data.tar.gz: e82f75b6e60cae6630c6b9255021ce4da2104608d0b18675ec5da20a0f55cc3f19ee5eb288720e9f6b5c615e243b1480274b52ab41d991e4a9d4e73ce3b7afd3

data/.gitignore

@@ -12,8 +12,9 @@
 .AppleDouble
 .LSOverride
 
-# Icon must end with two 
-Icon
+# Icon must end with two 
+Icon
+
 
 # Thumbnails
 ._*

data/.gitmodules

@@ -10,3 +10,9 @@
 [submodule "roles/nrser.rb"]
 	path = roles/nrser.rb
 	url = git@github.com:nrser/ansible-nrser.rb.git
+[submodule "roles/nrser.state_mate"]
+	path = roles/nrser.state_mate
+	url = git@github.com:nrser/ansible-nrser.state_mate.git
+[submodule "dev/gems/state_mate"]
+	path = dev/gems/state_mate
+	url = git@github.com:nrser/state_mate

data/.qb-options.yml

@@ -3,6 +3,6 @@ qb.gem:
   constant: QB
   license: MIT
 qb.project:
-  dev_bin: false
+  dev-bin: false
 qb.install_gem:
   rubies: global

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+# gem 'state_mate', path: './dev/gems/state_mate'
+
 # Specify your gem's dependencies in qb.gemspec
 gemspec

data/README.md

@@ -8,6 +8,11 @@ if this file exists in a role `qb` sees it will make that role available.
 
 the contents of this file allow you to configure how `qb` uses the role.
 
+### null values ###
+
+values set to `null` are treated like they're not there at all. to tell QB
+*not* to do something assign `false`.
+
 ### var_prefix ###
 
 declare prefix to be added to variable names from the command line for
@@ -30,7 +35,7 @@ to the `qb.project` role.
 
 however, this setting allows you to specify an alternative prefix. 
 
-if this is set to `null` or any varient of `false` the default will be used.
+if this is set to `null` the default will be used.
 
 ### default_dir ###
 

data/exe/qb

@@ -58,10 +58,10 @@ def with_clean_env &block
 end
 
 def metadata
-  if QB.gemspec.metadata
+  if QB.gemspec.metadata && !QB.gemspec.metadata.empty?
     "metadata:\n" + QB.gemspec.metadata.map {|key, value|
       "  #{ key }: #{ value }"
-    }.join("\n")
+    }.join("\n") + "\n"
   end
 end
 
@@ -69,7 +69,6 @@ def help
   puts <<-END
 version: #{ QB::VERSION }
 #{ metadata }
-
 syntax:
 
     qb ROLE [OPTIONS] DIRECTORY
@@ -138,7 +137,9 @@ def main args
   
   # create the dir if it doesn't exist (so don't have to cover this in
   # every role)
-  FileUtils.mkdir_p dir unless File.exists? dir
+  if role.mkdir
+    FileUtils.mkdir_p dir unless File.exists? dir
+  end
   
   saved_options_path = Pathname.new(dir) + '.qb-options.yml'
   
@@ -203,7 +204,11 @@ def main args
             'that' => "'ansible 2.1.2' in lookup('pipe', 'ansible --version')",
           },
         },
-        {'qb_facts' => nil},
+        {
+          'qb_facts' => {
+            'qb_dir' => dir,
+          }
+        },
       ],
       'roles' => [
         'nrser.blockinfile',

data/lib/qb/options.rb

@@ -64,11 +64,11 @@ module QB
         @cli_name = if @include_path.empty?
           Options.cli_ize_name @meta_name
         else
-          "#{ @include_path.join('-') }-#{ Options.cli_ize_name @meta_name }"
+          Options.cli_ize_name "#{ @include_path.join('-') }-#{ @meta_name }"
         end
         
         @var_name = if role.var_prefix
-          "#{ role.var_prefix }_#{ Options.var_ize_name @meta_name }"
+          Options.var_ize_name "#{ role.var_prefix }_#{ @meta_name }"
         else
           Options.var_ize_name @meta_name
         end
@@ -102,11 +102,15 @@ module QB
       private
       
       # get the value at the first found of the keys or the default.
+      # 
+      # `nil` (`null` in yaml files) are treated like they're not there at
+      # all. you need to use `false` if you want to tell QB not to do something.
+      # 
       def meta_or keys, default
         keys = [keys] if keys.is_a? String
         keys.each do |key|
-          if @meta.key? key
-            return @meta[key]
+          if meta.key?(key) && !meta[key].nil?
+            return meta[key]
           end
         end
         default
@@ -196,10 +200,15 @@ module QB
             
             # don't use short names when included (for now)
             if include_path.empty? && option.meta['short']
-              on_args << "-#{ option.meta['short'] } #{ option.cli_name.upcase }"
+              on_args << "-#{ option.meta['short'] } #{ option.meta_name.upcase }"
             end
             
-            on_args << "--#{ option.cli_name }=#{ option.cli_name.upcase }"
+            if option.meta['accept_false']
+              on_args << "--[no-]#{ option.cli_name }=#{ option.meta_name.upcase }"
+            else
+              on_args << "--#{ option.cli_name }=#{ option.meta_name.upcase }"
+            end
+              
             
             on_args << ruby_type
           end

data/lib/qb/role.rb

@@ -180,18 +180,22 @@ module QB
     # passing them to the role. defaults to `#namespaceless` unless specified
     # in meta.
     def var_prefix
-      meta['var_prefix'] || namespaceless
+      # ugh, i was generating meta/qb.yml files that set 'var_prefix' to
+      # `null`, but it would be nice to 
+      # 
+      meta_or 'var_prefix', namespaceless
     end
     
     # get the options from the metadata, defaulting to [] if none defined
     def options
-      meta['options'] || meta['opts'] || meta['vars'] || []
+      meta_or ['options', 'opts', 'vars'], []
     end
     
     # old name
     alias_method :vars, :options
     
-    # loads the defaults from defaults/main.yml, caching by default
+    # loads the defaults from vars/main.yml and defaults/main.yml,
+    # caching by default. vars override defaults values.
     def load_defaults cache = true
       defaults_path = @path + 'defaults' + 'main.yml'
       defaults = if defaults_path.file?
@@ -200,6 +204,15 @@ module QB
         {}
       end
       
+      vars_path = @path + 'vars' + 'main.yml'
+      vars = if vars_path.file?
+        YAML.load(vars_path.read) || {}
+      else
+        {}
+      end
+      
+      defaults = defaults.merge! vars
+      
       if cache
         @defaults = defaults
       end
@@ -213,11 +226,30 @@ module QB
     end
     
     def save_options
-      if meta.key? 'save_options'
-        !!meta['save_options']
-      else
-        true
+      !!meta_or('save_options', true)
+    end
+    
+    # if the exe should auto-make the directory. this is nice for most roles
+    # but some need it to be missing
+    def mkdir
+      !!meta_or('mkdir', true)
+    end
+    
+    private
+    
+    # get the value at the first found of the keys or the default.
+    # 
+    # `nil` (`null` in yaml files) are treated like they're not there at
+    # all. you need to use `false` if you want to tell QB not to do something.
+    # 
+    def meta_or keys, default
+      keys = [keys] if keys.is_a? String
+      keys.each do |key|
+        if meta.key?(key) && !meta[key].nil?
+          return meta[key]
+        end
       end
+      default
     end
   end
 end

data/lib/qb/version.rb

@@ -1,7 +1,7 @@
 module QB
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
   
   def self.gemspec
     Gem.loaded_specs[GEM_NAME]

data/library/qb_facts.py

@@ -1,28 +1,68 @@
 #!/usr/bin/python
 
 import subprocess
+import os
+import glob
+import json
+
+def gemspec_path(dir):
+    paths = glob.glob(os.path.join(dir, '*.gemspec'))
+    
+    if len(paths) == 0:
+        return None
+    elif len(paths) == 1:
+        return paths[0]
+    else:
+        # this shouldn't really happen, but i don't want to stop the show...
+        return paths[0]
+
+def is_gem(dir):
+    return bool(gemspec_path(dir))
 
 def main():
     module = AnsibleModule(
         argument_spec = dict(
+            qb_dir = dict(require = True, type = 'path'),
         ),
         supports_check_mode = False,
     )
-
+    
+    qb_dir = module.params['qb_dir']
     
     facts = {}
     
-    d = {
-        'git_user_name': ['git', 'config', 'user.name'],
-        'git_user_email': ['git', 'config', 'user.email'],
+    cmds = {
+        'qb_git_user_name': ['git', 'config', 'user.name'],
+        'qb_git_user_email': ['git', 'config', 'user.email'],
     }
     
-    for key, cmd in d.iteritems():        
+    for key, cmd in cmds.iteritems():        
         try:
-            facts[key] = subprocess.check_output(cmd).rstrip()
+            value = subprocess.check_output(cmd).rstrip()
+            facts[key] = value
         except subprocess.CalledProcessError as e:
-            pass        
+            pass
+    
+    if is_gem(qb_dir):
+        ruby = '''
+            require 'json'
+            spec = Gem::Specification::load("%s")
+            puts JSON.dump({
+                'name' => spec.name,
+                'version' => spec.version,
+            })
+        ''' % (gemspec_path(qb_dir))
+        
+        spec_json = subprocess.check_output(['ruby', '-e', ruby])
+        gem_info = json.loads(spec_json)
+        gem_info['gemspec_path'] = gemspec_path(qb_dir)
         
+        facts['qb_gem_info'] = gem_info
+    
+    # depreciated namespaceless names
+    facts['git_user_name'] = facts['qb_git_user_name']
+    facts['git_user_email'] = facts['qb_git_user_email']
+    
     changed = False
 
     module.exit_json(

data/qb.gemspec

@@ -21,10 +21,14 @@ Gem::Specification.new do |spec|
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
     Dir.chdir(submodule_path) do
       submodule_relative_path = submodule_path.sub gem_dir, ""
-      # issue git ls-files in submodule's directory and
-      # prepend the submodule path to create absolute file paths
-      `git ls-files`.split($\).each do |filename|
-        spec.files << "#{submodule_relative_path}/#{filename}"
+      
+      # don't bundle dev submods
+      unless submodule_relative_path.start_with? 'dev/'
+        # issue git ls-files in submodule's directory and
+        # prepend the submodule path to create absolute file paths
+        `git ls-files`.split($\).each do |filename|
+          spec.files << "#{submodule_relative_path}/#{filename}"
+        end
       end
     end
   end
@@ -37,8 +41,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   
-  spec.add_dependency "cmds", ">= 0.0.9"
-  spec.add_dependency "nrser-extras", ">= 0.0.3"
+  spec.add_dependency "cmds",'~> 0.0', ">= 0.0.9"
+  spec.add_dependency "nrser-extras", '~> 0.0', ">= 0.0.3"
+  spec.add_dependency "state_mate", '~> 0.0', ">= 0.0.8"
+  
   
   if QB::VERSION.end_with? '.dev'
     commit = `git rev-parse HEAD`.strip

data/roles/nrser.rb/library/vars.rb

@@ -47,11 +47,9 @@ def main
     })
     
   rescue Exception => e
-    raise e
-    
     print JSON.dump({
       'failed' => true,
-      'msg' => e,
+      'msg' => e.message,
       # 'input' => input,
       # 'args' => args,
       # 'ARGV' => ARGV,

data/roles/nrser.state_mate/.gitignore

@@ -0,0 +1,38 @@
+# ruby / gem / bundler stuff
+# ==========================
+
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+
+# osx
+# ===
+
+.DS_Store
+
+# test stuff
+# ==========
+
+# stuff copied in from the repo
+test/ansible/roles/nrser.state_mate
+
+# temp playbook generated by rspec tests
+test/ansible/temp-playbook.yml

data/roles/nrser.state_mate/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/roles/nrser.state_mate/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+group :test, :development do
+  gem "rspec"
+  gem "cmds"
+  gem "nrser-extras"
+  gem "state_mate", path: "#{ ENV.fetch('GITHUB_ROOT') }/nrser/state_mate"
+end

data/roles/nrser.state_mate/Gemfile.lock

@@ -0,0 +1,46 @@
+PATH
+  remote: /Users/nrser/dev/gh/nrser/state_mate
+  specs:
+    state_mate (0.0.7.dev)
+      CFPropertyList (~> 2.3)
+      cmds (~> 0.0, >= 0.0.9)
+      nrser (~> 0.0, >= 0.0.13)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.2)
+    cmds (0.0.9)
+      erubis (~> 2.7)
+      nrser (>= 0.0.13)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    nrser (0.0.13)
+    nrser-extras (0.0.3)
+      cmds (>= 0.0.7)
+      nrser (>= 0.0.13)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cmds
+  nrser-extras
+  rspec
+  state_mate!
+
+BUNDLED WITH
+   1.10.6

data/roles/nrser.state_mate/README.md

@@ -0,0 +1,45 @@
+nrser.state_mate
+================
+
+installs the `state_mate` gem and provides the `state` Ansible module for
+maintaining system state on OSX.
+
+Requirements
+------------
+
+a Ruby version where the user you run Ansible as can install gems.
+
+Role Variables
+--------------
+
+-   `state_mate_version`: version of the `state_mate` gem to install.
+
+Dependencies
+------------
+
+none.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+        - role: nrser.state_mate
+      tasks:
+        - name: always show scrollbars
+          state:
+            defaults:
+              key: NSGlobalDomain:AppleShowScrollBars
+              set: Always
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+<https://github.com/nrser>

data/roles/nrser.state_mate/VERSION

@@ -0,0 +1 @@
+0.1.1

data/roles/nrser.state_mate/defaults/main.yml

@@ -0,0 +1,3 @@
+---
+# defaults file for nrser.state_mate
+state_mate_version: 0.0.7

data/roles/nrser.state_mate/library/state

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+# WANT_JSON
+
+# needed for dev
+begin
+  require 'bundler/setup'
+rescue LoadError => e
+end
+
+require 'json'
+require 'shellwords'
+require 'pp'
+require 'yaml'
+
+require 'nrser'
+require 'state_mate'
+require 'state_mate/adapters/yaml'
+
+using NRSER
+
+def main
+  input = nil
+  args = nil
+  changed = false
+  
+  # preorder for yaml keys
+  StateMate::Adapters::YAML.preorder = ['name', 'tags', 'command']
+
+  begin
+    input = File.read ARGV[0]
+    args = JSON.load input
+    
+    raise "arg fail" if args['fail']
+    
+    # filter out keys that start with '_ansible', which are ansible-added
+    # values.
+    # 
+    # example:
+    # 
+    #     {"_ansible_version"=>"2.1.0.0",
+    #      "_ansible_selinux_special_fs"=>["fuse", "nfs", "vboxsf", "ramfs"],
+    #      "_ansible_no_log"=>false,
+    #      "_ansible_verbosity"=>0,
+    #      "_ansible_syslog_facility"=>"LOG_USER",
+    #      "_ansible_diff"=>false,
+    #      "_ansible_debug"=>false,
+    #      "_ansible_check_mode"=>false}
+    #
+    spec = args.reject {|k, v| k.start_with? '_ansible'}
+    
+    if spec['debug']
+      StateMate.debug = spec['debug']
+      spec.delete 'debug'
+      
+      StateMate.debug "START RUN #{ '*' * 42 }"
+      StateMate.debug YAML.dump(spec)
+    end
+    
+    changes = StateMate.execute spec
+    
+    StateMate.debug changes: changes
+
+    print JSON.dump({
+      'changed' => !changes.empty?,
+      'changes' => changes,
+    })
+  rescue Exception => e
+    StateMate.debug error: e
+    
+    print JSON.dump({
+      'failed' => true,
+      # 'msg' => e.format, # broken?
+      'msg' => e.message,
+      # 'input' => input,
+      'args' => args,
+      # 'ARGV' => ARGV,
+      # 'ruby' => RUBY_VERSION,
+    })
+  end
+end
+
+main if __FILE__ == $0