puppet-repl 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8322d7d0831649ede23894dc08e9135fadc252cd
-  data.tar.gz: d910d7246982ffb04f5f0dda6a64a7408ab035c5
+  metadata.gz: 6a03bd43b71008994c676b5199c458efd3e729e0
+  data.tar.gz: 738b84539dbc265027dbd07ef2893c037395b6d9
 SHA512:
-  metadata.gz: fa51e79914d8b315c07572c50ba52cd88c38edf6ab2e17bada681e8e42cc2537d557774dbeeaab8e58a7d3a62e8ffef2878eb34de431b5b59dd42d830688ab78
-  data.tar.gz: 4da905e6ad4e7201a329bb661544bec8a44d98c5c6cee488ea9e488e3850f2eebddca1478f493e9cb0bdceed7a4eff8f7a753283ddd5e2a6f9e9bfa23e0b54de
+  metadata.gz: 7fd864b5231b000b3cafc243f39af29a97c82491acc767ad0a342360dc5b96c2ab56e505ef022c0fb06a497f05b82723be8b8f450c36c01877373ab10342e2e6
+  data.tar.gz: 8e1c79ae398c14eb95dc620b740c101a6a28bd894f651a8e3273047db37661bd51932c1bf556a5ead9bc332e4dd22f9760b480635b0a70ef711d0ba1b7a5cb29

data/.gitlab-ci.yml

@@ -0,0 +1,118 @@
+stages:
+  - test
+  - deploy
+  - web_deploy
+
+variables:
+  HEROKU_STAGING_APP: murmuring-plateau-62715
+  HEROKU_PROD_APP: still-tor-57873
+
+.puppet_def: &puppet_job_def
+  stage: test
+  script:
+    - bundle install --without development
+    - bundle exec puppet module install puppetlabs-stdlib
+    - bundle exec rake spec
+
+.ruby_193: &ruby193
+  image: ruby:1.9.3
+
+.ruby_20: &ruby20
+  image: ruby:2.0
+
+.ruby_21: &ruby21
+  image: ruby:2.1
+
+.ruby_22: &ruby22
+  image: ruby:2.2
+
+.ruby_23: &ruby23
+  image: ruby:2.3
+
+gem_production:
+  image: ruby:2.1
+  before_script:
+    - gem install dpl
+  stage: deploy
+  script:
+    - dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY
+  only:
+    - tags
+
+# web_staging:
+#   stage: web_deploy
+#   before_script:
+#     - gem install dpl
+#   script:
+#     - dpl --provider=heroku --strategy=git --app=$HEROKU_STAGING_APP --api-key=$HEROKU_API_KEY
+#   only:
+#     - master
+#
+# web_production:
+#   stage: web_deploy
+#   before_script:
+#     - gem install dpl
+#   script:
+#     - dpl --provider=heroku --strategy=git --app=$HEROKU_PROD_APP --api-key=$HEROKU_API_KEY
+#   only:
+#     - tags
+
+puppet_38_ruby193:
+  variables:
+    PUPPET_GEM_VERSION: '3.8'
+  <<: *puppet_job_def
+  <<: *ruby193
+
+puppet_38_ruby20:
+  variables:
+    PUPPET_GEM_VERSION: '3.8'
+  <<: *puppet_job_def
+  <<: *ruby20
+
+puppet_38_ruby21:
+  variables:
+    PUPPET_GEM_VERSION: '3.8'
+  <<: *puppet_job_def
+  <<: *ruby21
+
+puppet_43_ruby20:
+  variables:
+    PUPPET_GEM_VERSION: '4.4'
+  <<: *puppet_job_def
+  <<: *ruby20
+
+puppet_43_ruby21:
+  variables:
+    PUPPET_GEM_VERSION: '4.4'
+  <<: *puppet_job_def
+  <<: *ruby21
+
+puppet_43_ruby22:
+  variables:
+    PUPPET_GEM_VERSION: '4.4'
+  <<: *puppet_job_def
+  <<: *ruby22
+
+puppet_44_ruby21:
+  variables:
+    PUPPET_GEM_VERSION: '4.4'
+  <<: *puppet_job_def
+  <<: *ruby21
+
+puppet_44_ruby22:
+  variables:
+    PUPPET_GEM_VERSION: '4.4'
+  <<: *puppet_job_def
+  <<: *ruby22
+
+puppet_45_ruby21:
+  variables:
+    PUPPET_GEM_VERSION: '4.5'
+  <<: *puppet_job_def
+  <<: *ruby21
+
+puppet_45_ruby22:
+  variables:
+    PUPPET_GEM_VERSION: '4.5'
+  <<: *puppet_job_def
+  <<: *ruby22

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 0.2.3
+  * fixes #21 - type display causes error
 ## 0.2.2
   * adds better support for playing back puppet code
       * this now allows playback of any manifest

data/README.md

@@ -27,7 +27,8 @@
   - [Copyright](#copyright)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
-[![BuildStatus](https://travis-ci.org/nwops/puppet-repl.svg?branch=master)](https://travis-ci.org/nwops/puppet-repl?branch=master)[![Gem Version](https://badge.fury.io/rb/puppet-repl.svg)](https://badge.fury.io/rb/puppet-repl)
+![Build Status](https://gitlab.com/nwops/puppet-repl/badges/master/build.svg)
+[![Gem Version](https://badge.fury.io/rb/puppet-repl.svg)](https://badge.fury.io/rb/puppet-repl)
 # puppet-repl
 
 A interactive command line tool for evaluating the puppet language.
@@ -236,7 +237,7 @@ If using the [web based repl](https://www.puppet-repl.com) you can playback a sh
 which would start a repl session and then load the content from the url or parameter.
 
 Example:
-https://www.puppet-repl.com/play?url=https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0
+https://www.puppet-repl.com/play?url=https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0.txt
 
 or for single commands
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/awesome_print/ext/awesome_puppet.rb

@@ -16,6 +16,8 @@ module AwesomePrint
         cast = :puppet_type
       elsif (defined?(::Puppet::Parser::Resource)) && (object.class < ::Puppet::Parser::Resource)
         cast = :puppet_resource
+      elsif /Puppet::Pops::Types/.match(object.class.to_s)
+        cast = :puppet_type
       end
       cast
     end
@@ -27,6 +29,7 @@ module AwesomePrint
 
     def awesome_puppet_type(object)
       return '' if object.nil?
+      return object.to_s unless object.respond_to?(:name) && object.respond_to?(:title)
       h = object.to_hash.merge(:name => object.name, :title => object.title)
       res_str = awesome_hash(h)
       "#{object.class} #{res_str.gsub(':', '')}"

data/lib/puppet-repl/cli.rb

@@ -51,12 +51,13 @@ module PuppetRepl
       if type.respond_to?(:type_name) and type.respond_to?(:title)
         title = type.title
         type_name = type.type_name
-      else
+      elsif type_result = /(\w+)\['?(\w+)'?\]/.match(type.to_s)
         # not all types have a type_name and title so we
         # output to a string and parse the results
-        type_result = /(\w+)\['?(\w+)'?\]/.match(type.to_s)
         title = type_result[2]
         type_name = type_result[1]
+      else
+        return type
       end
       res = scope.catalog.resource(type_name, title)
       if res

data/lib/puppet-repl/support/play.rb

@@ -18,6 +18,11 @@ module PuppetRepl
         require 'uri'
         url_data = URI(url)
         case url_data.host
+        when /^gist\.github*/
+          unless url_data.path =~ /raw/
+            url = url += '.txt'
+          end
+          url
         when /^github.com/
           if url_data.path =~ /blob/
             url.gsub('blob', 'raw')
@@ -26,6 +31,7 @@ module PuppetRepl
           unless url_data.path =~ /raw/
             url = url += '.txt'
           end
+          url
         when /^gitlab.com/
           if url_data.path =~ /snippets/
             url += '/raw' unless url_data.path =~ /raw/

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PuppetRepl
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/puppet-repl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: puppet-repl 0.2.2 ruby lib
+# stub: puppet-repl 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "puppet-repl"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Corey Osman"]
-  s.date = "2016-05-21"
+  s.date = "2016-06-01"
   s.description = "A interactive command line tool for evaluating the puppet language"
   s.email = "corey@nwops.io"
   s.executables = ["prepl"]
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".gitlab-ci.yml",
     ".rspec",
-    ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",

data/spec/puppet-repl_spec.rb

@@ -26,6 +26,29 @@ describe "PuppetRepl" do
     repl.parser.evaluate_string(repl.scope, input)
   end
 
+  describe 'types' do
+
+    describe 'string' do
+      let(:input) do
+        "String"
+      end
+      it 'shows type' do
+        repl.handle_input(input)
+        expect(output.string).to eq("\n => String\n")
+      end
+    end
+    describe 'Array' do
+      let(:input) do
+        "type_of([1,2,3,4])"
+      end
+      it 'shows type' do
+        repl.handle_input(input)
+        expect(output.string).to eq("\n => Tuple[Integer[1, 1], Integer[2, 2], Integer[3, 3], Integer[4, 4]]\n")
+      end
+    end
+
+  end
+
   describe 'multiple lines of input' do
     describe '3 lines' do
       let(:input) do
@@ -118,11 +141,11 @@ describe "PuppetRepl" do
     end
 
     before(:each) do
-      allow(repl).to receive(:fetch_url_data).with(file_url).and_return(File.read(fixtures_file))
+      allow(repl).to receive(:fetch_url_data).with(file_url + '.txt').and_return(File.read(fixtures_file))
     end
 
     let(:file_url) do
-      'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0/raw'
+      'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0'
     end
     it 'file' do
       repl.handle_input("play #{fixtures_file}")

data/spec/support_spec.rb

@@ -139,7 +139,6 @@ describe 'support' do
         end
       end
     end
-
     describe 'github' do
       describe 'raw' do
         let(:url) { 'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0/raw'}
@@ -148,7 +147,13 @@ describe 'support' do
           expect(repl.convert_to_text(url)).to eq(converted)
         end
       end
-
+      describe 'raw' do
+        let(:url) { 'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0'}
+        let(:converted) { 'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0.txt' }
+        it do
+          expect(repl.convert_to_text(url)).to eq(converted)
+        end
+      end
       describe 'raw gist' do
         let(:url) {'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0/raw/c8f6be52da5b2b0eeaabb9aa75832b75793d35d1/controls.pp'}
         let(:converted) {'https://gist.githubusercontent.com/logicminds/f9b1ac65a3a440d562b0/raw/c8f6be52da5b2b0eeaabb9aa75832b75793d35d1/controls.pp'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-repl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -77,8 +77,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-cache: bundler
-install: "bundle install --without development"
-before_script: "bundle exec puppet module install puppetlabs-stdlib"
-script: "bundle exec rspec"
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.2.1
-  - 2.1.3
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 3.8"
-    - PUPPET_GEM_VERSION="~> 4.2"
-    - PUPPET_GEM_VERSION="~> 4.3"
-    - PUPPET_GEM_VERSION="~> 4.4"
-notifications:
-  email: corey@logicminds.biz
-
-matrix:
-  exclude:
-    - rvm: 2.2.1
-      env: PUPPET_GEM_VERSION="~> 3.8"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 4.4"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 4.3"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 4.2"