puppetdb_query 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4a70cd22ca95133379508256d33bc63c0d922d
-  data.tar.gz: 4c2d190ac3fac79c08bc99786123665d8aacdc75
+  metadata.gz: 3301979985af2a5c8e3e52c9aebe6204d91a2bd3
+  data.tar.gz: 2a3155d079b92856bb7f9ff0b0a8045c9d973e25
 SHA512:
-  metadata.gz: 5d688015cbd72fc52980ecfc2415a3312a7d83a610cec35c4e41a851e5fddf30093ee8525a987ec1cf085073a5e686863a8cc1eddaf08cb70601ec73ca6ee96d
-  data.tar.gz: bff404d3da3089951c784e6508be8150e667f9b061d53a373ae7d50833aaa04ffbbf56a5bc6bfda5268bbc6646c2a7288bc9daea97097700af6a71542c3ca76a
+  metadata.gz: 22aa0dcca610efafe04080ed11683f4d03fe038c2be0d80dca89b93d8c39deb22ce186c2b8cbf0b4da653c73304bf11153bca56761b0e105f33c24ee45b3f43e
+  data.tar.gz: 791c167a17715cc0de051ce33c5a05bf8d603a3b6ad70c01a7584c24a4d318ad2be4678db8e2191a26dd310639cea4eb3371cb0bf253f07a087b0b87905f74f8

data/.travis.yml

@@ -1,19 +1,22 @@
 sudo: false
 language: ruby
 cache: bundler
+before_install: gem install bundler
+install: bundle install --jobs=3 --retry=3
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - ruby-head
+  - jruby-9.1.5.0
   - jruby-19mode
   - jruby-head
-  - rbx
-  - rbx-19mode
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: jruby-head
-    - rvm: rbx
-    - rvm: rbx-19mode
+    - rvm: ruby-head
+

data/Gemfile

@@ -4,8 +4,10 @@ gemspec
 
 # only for local testing but not needed for spec tests
 group :test do
+  gem 'rake',          '~>11'
   gem 'mongo',         '>=2.2.0' # if you want to work with a mongodb
   gem 'ruby-puppetdb', '=2.2.0'  if RUBY_VERSION !~ /^1\./
   gem 'puppet',        '=3.8.7'  if RUBY_VERSION !~ /^1\./
-  gem "rubocop",       '=0.39.0' if RUBY_VERSION =~ /^1\./
+  gem 'rubocop',       '=0.39.0' if RUBY_VERSION =~ /^1\./
+  gem 'rubocop'                  if RUBY_VERSION !~ /^1\./
 end

data/README.md

@@ -88,6 +88,8 @@ After checking out the repo, run `bundle install` to install dependencies.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+Travis results under (https://travis-ci.org/m-31/puppetdb_query)
+
 ## Contributing
 
 1. Fork it ( https://github.com/m-31/puppetdb_query/fork )

data/lib/puppetdb_query/parser.rb

@@ -30,6 +30,7 @@ module PuppetDBQuery
       OR.symbol        =>  OR,
       NOT.symbol       =>  NOT,
       EQUAL.symbol     =>  EQUAL,
+      :is              =>  EQUAL,
       NOT_EQUAL.symbol =>  NOT_EQUAL,
       MATCH.symbol     =>  MATCH,
       IN.symbol        =>  IN,
@@ -108,7 +109,7 @@ module PuppetDBQuery
         term = args
       else
         error("no operator #{get_operator} expected here") if get_operator
-        if Tokenizer::LANGUAGE_STRINGS.include?(token) && ![:true, :false].include?(token)
+        if Tokenizer::LANGUAGE_STRINGS.include?(token) && ![:true, :false, :null].include?(token)
           error("that was not expected here: '#{Tokenizer.symbol_to_string(token)}'")
         end
         token = read_token
@@ -121,7 +122,7 @@ module PuppetDBQuery
     # rubocop:enable Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/MethodLength
 
-    # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/BlockLength
     # rubocop:disable Metrics/MethodLength,Metrics/PerceivedComplexity
     def add_next_infix_terms(priority, first)
       old_operator = nil
@@ -169,7 +170,7 @@ module PuppetDBQuery
         old_operator = operator
       end
     end
-    # rubocop:enable Metrics/AbcSize,Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/BlockLength
     # rubocop:enable Metrics/MethodLength,Metrics/PerceivedComplexity
 
     # rubocop:disable Style/AccessorMethodName

data/lib/puppetdb_query/version.rb

@@ -1,3 +1,3 @@
 module PuppetDBQuery
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 end

data/puppetdb_query.gemspec

@@ -17,11 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.required_ruby_version = '>= 1.9.3'
   spec.require_paths = ["lib"]
   spec.post_install_message = "  Sitting quietly, doing nothing, spring comes, and grass grows by itself."
 
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop" #, "0.43.0" # matches with .rubocop.yml
   spec.add_development_dependency "easy_diff"
 end

data/scripts/deploy_gem.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# release puppetdb_query gem to rubygems
+
+# exit on any error
+set -e
+
+#############################################################################
+## defaults
+
+readonly progname=$(basename $0)
+readonly script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+readonly main_dir=$( cd "${script_dir}" && cd .. && pwd )
+readonly application=puppetdb_query
+readonly module=PuppetDBQuery
+
+#############################################################################
+## functions
+
+## write green message with time stamp to stdout
+function puts () {
+  echo -e "\033[0;32m"$(date +"%Y-%m-%d %T") $*"\033[0m"
+}
+
+## bump version, must be in main git directory
+function bump_version () {
+  puts "bump ${application} gem version"
+
+  old_version=$( ruby -I lib/${application} -e "require 'version'; puts Gem::Version.new(${module}::VERSION)" )
+  puts "gem version currently:" ${old_version}
+
+  new_version=$( ruby -I lib/${application} -e "require 'version'; puts Gem::Version.new(${module}::VERSION + '.1').bump" )
+  puts "we will change it into:" ${new_version}
+
+  cat lib/${application}/version.rb | sed "s/$old_version/$new_version/" > lib/${application}/version.rb.new
+  mv lib/${application}/version.rb.new lib/${application}/version.rb
+}
+
+## commit and push version, must be in main git directory
+function commit_and_push_version () {
+  puts "commit and push ${application} gem version"
+  git add lib/${application}/version.rb
+  git commit -m "m31's version bumper"
+  git push
+}
+
+#############################################################################
+## main processsing
+
+cd ${main_dir}
+
+puts "trying to release ${application} gem to rubygems"
+puts
+
+puts "updating git repository"
+git pull -r
+
+puts "build new Gemfile.lock with bundle install"
+rm Gemfile.lock
+bundle install
+
+puts "check and test"
+bundle exec rake spec
+
+bump_version
+commit_and_push_version
+
+puts "build gem"
+result=$( gem build ${application}.gemspec )
+puts "  ${result}"
+
+# get gem file name
+set +e
+gem_file=$( echo $result | grep -o "${application}-[.0-9]*\.gem$" )
+set -e
+puts "  gem file:" $gem_file
+
+## check if group was specified
+if [ -z "${gem_file}" ]; then
+    echo "generated gem file not found" >&2
+    exit 1
+fi
+
+puts "push gem to rubygems"
+gem push ${gem_file} --host https://rubygems.org
+
+echo -e "\033[0;34mThe lioness has rejoined her cub, and all is right in the jungle...\033[0m"

data/spec/puppetdb_query/parser_spec.rb

@@ -30,6 +30,11 @@ describe PuppetDBQuery::Parser do
          ))
       ]
     ],
+    [ 'type in [jenkins, mongo, tomcat]',
+      [PuppetDBQuery::Term.new(PuppetDBQuery::Parser::IN)
+        .add(:type, [:jenkins, :mongo, :tomcat])
+      ]
+    ],
   ].freeze
 
   CORRECT_PARSER_DATA.each do |q, a|

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_query
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Michael Meyling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
-- !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
@@ -38,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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: easy_diff
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +65,7 @@ files:
 - lib/puppetdb_query/updater.rb
 - lib/puppetdb_query/version.rb
 - puppetdb_query.gemspec
+- scripts/deploy_gem.sh
 - spec/puppetdb_query/parser_spec.rb
 - spec/puppetdb_query/to_mongo_spec.rb
 - spec/puppetdb_query/tokenizer_spec.rb
@@ -111,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="