Merge branch 'release/v1.2.1'

.circleci/config.yml

@@ -0,0 +1,89 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+version: 2
+
+references:
+  machine-defaults: &environment-defaults
+    machine: true
+  install-augeas: &install-augeas
+    run:
+      name: Install Augeas
+      command: |
+        sudo apt-get update && sudo apt-get install -y libaugeas-dev libxml2-dev libgmp3-dev
+  install-rvm: &install-rvm
+    run:
+      name: Install RVM
+      command: |
+        gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+        \curl -sSL https://get.rvm.io | bash -s stable
+  intall-ruby: &intall-ruby
+    run:
+      name: Install Ruby
+      shell: /bin/bash -leo pipefail
+      command: |
+        rvm use $RUBY_VERSION --default
+        gem install bundler --no-rdoc --no-ri
+  restore-cache-dependencies: &restore-cache-dependencies
+    # Download and cache dependencies
+    restore_cache:
+      keys:
+        - v1-dependencies-{{ checksum "Gemfile.lock" }}
+  save-cache-dependencies: &save-cache-dependencies
+    save_cache:
+      paths:
+       - ./vendor/bundle
+      key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+  bundle-dependencies: &bundle-dependencies
+    run:
+      name: Fetch dependencies via Bundler
+      shell: /bin/bash -leo pipefail
+      command: |
+        rvm use $RUBY_VERSION
+        bundle install --jobs=4 --retry=3 --path vendor/bundle
+  beaker: &beaker
+    run:
+      name: Run integration tests using Beaker
+      shell: /bin/bash -leo pipefail
+      command: |
+        rvm use $RUBY_VERSION
+        bundle exec rake beaker
+
+  steps: &steps
+    steps:
+      - checkout
+      - *install-augeas
+      - *install-rvm
+      - *intall-ruby
+      - *restore-cache-dependencies
+      - *bundle-dependencies
+      - *save-cache-dependencies
+      - *beaker
+
+workflows:
+  version: 2
+  integration-tests:
+    jobs:
+      - centos-6
+      - debian-8
+      - ubuntu-1404
+
+jobs:
+  centos-6:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      RUBY_VERSION: '2.1'
+      RS_SET: centos-6-docker
+  debian-8:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      RUBY_VERSION: '2.1'
+      RS_SET: debian-8-docker
+  ubuntu-1404:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      RUBY_VERSION: '2.1'
+      RS_SET: ubuntu-1404-docker

.editorconfig

@@ -3,9 +3,10 @@
 # top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file, indent by 2 spaces
+# Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
 insert_final_newline = true
+charset = utf-8
 indent_style = space
 indent_size = 2

.gitignore

@@ -13,4 +13,3 @@ Vagrantfile
 .DS_Store
 Gemfile.local
 .idea/
-Gemfile.lock

.rspec

@@ -1,2 +1,3 @@
 --format documentation
---color
+--color
+--backtrace

.rubocop.ruby-1.8.7.yml

@@ -1,5 +1,6 @@
+inherit_from: .rubocop_todo.yml
 # Ruby 1.8.7 needs the . on chain of method calls at the end of a line
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
 # Ruby 1.8.7 doesn't have the -> lambda
@@ -10,11 +11,9 @@ Style/Lambda:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Style/StringLiterals:
+Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 140
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table

.rubocop.yml

@@ -1,6 +1,28 @@
+inherit_from: .rubocop.ruby-1.8.7.yml
 AllCops:
+  TargetRubyVersion: 1.9
+  Include:
+    - gemfiles/Gemfile*
   Exclude:
-    - 'vendor/**/*'
-
+    - vendor/**/*
+    - .vendor/**/*
+    - pkg/**/*
+    - spec/fixtures/**/*
+    - gemfiles/Gemfile*.lock
 Metrics/LineLength:
-  Max: 140
+  # Max: 140 # Commented out to pass rubocop todo analysis
+  Max: 400
+Style/FileName:
+  Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: native, lf, crlf
+Layout/EndOfLine:
+  EnforcedStyle: lf
+
+Style/ClassAndModuleChildren:
+  Enabled: false