travis-yaml 0.1.0 → 0.2.0

data/spec/nodes/os_spec.rb

@@ -25,4 +25,17 @@ describe Travis::Yaml::Nodes::OS do
     expect(config.os.warnings).to include('dropping "linux", does not support "objective-c"')
     expect(config.os.warnings).to include('no suitable operating system given for "objective-c", using "osx"')
   end
+
+  specify 'complains about jdk on osx' do
+    config = Travis::Yaml.parse(os: :osx, language: :java, jdk: :default)
+    expect(config.os)       .to be == ['osx']
+    expect(config.language) .to be == 'java'
+    expect(config.jdk)      .to be_nil
+    expect(config.warnings).to include('dropping "jdk" section: currently not supported on "osx"')
+  end
+
+  specify 'does not complain about the default os' do
+    config = Travis::Yaml.parse(language: 'objective-c')
+    expect(config.warnings).to be_empty
+  end
 end

data/spec/nodes/root_spec.rb

@@ -0,0 +1,36 @@
+describe Travis::Yaml::Nodes::Root do
+  let :warnings do
+    subject.warnings
+  end
+
+  describe "from YAML" do
+    context "sudo" do
+      subject :yaml do
+        Travis::Yaml.parse <<-YAML.gsub(/^ {10}/, '')
+          language: ruby
+          sudo: false
+        YAML
+      end
+
+      specify "gives no warnings" do
+        expect(warnings).to be_empty
+      end
+    end
+
+    context "double entry" do
+      subject :yaml do
+        Travis::Yaml.parse <<-YAML.gsub(/^ {10}/, '')
+          addons:
+            postgresql: "9.3"
+          addons:
+            code_climate:
+              api_token: "foobar"
+        YAML
+      end
+
+      specify "warns about double entries" do
+        expect(warnings).to include('has multiple "addons" entries, keeping last entry')
+      end
+    end
+  end
+end

data/spec/nodes/secure_spec.rb

@@ -0,0 +1,145 @@
+describe Travis::Yaml::SecureString do
+  context 'encrypted value with secure mapping' do
+    subject(:config) { Travis::Yaml.load 'env: { secure: "foo" }' }
+    it { should     be_encrypted }
+    it { should_not be_decrypted }
+
+    context 'its value' do
+      subject(:value) { config.env.matrix.first.value  }
+      it { should     be_a(Travis::Yaml::SecureString) }
+      it { should     be_encrypted                     }
+      it { should_not be_decrypted                     }
+    end
+
+    context 'after decryption' do
+      before { config.decrypt { |v| v.upcase } }
+      it { should be_encrypted }
+      it { should be_decrypted }
+
+      context 'its value' do
+        subject(:value) { config.env.matrix.first.value }
+        it { should be_encrypted }
+        it { should be_decrypted }
+
+        specify 'correct encrypted and decrypted value' do
+          expect(value.encrypted_string).to be == 'foo'
+          expect(value.decrypted_string).to be == 'FOO'
+        end
+      end
+    end
+  end
+
+  context 'encrypted value with secure tag' do
+    subject(:config) { Travis::Yaml.load 'env: !secure "foo"' }
+    it { should     be_encrypted }
+    it { should_not be_decrypted }
+
+    context 'its value' do
+      subject(:value) { config.env.matrix.first.value  }
+      it { should     be_a(Travis::Yaml::SecureString) }
+      it { should     be_encrypted                     }
+      it { should_not be_decrypted                     }
+    end
+  end
+
+  context 'encrypted value with encrypted tag' do
+    subject(:config) { Travis::Yaml.load 'env: !encrypted "foo"' }
+    it { should     be_encrypted }
+    it { should_not be_decrypted }
+
+    context 'its value' do
+      subject(:value) { config.env.matrix.first.value  }
+      it { should     be_a(Travis::Yaml::SecureString) }
+      it { should     be_encrypted                     }
+      it { should_not be_decrypted                     }
+    end
+  end
+
+  context 'encrypted value with decrypted tag' do
+    subject(:config) { Travis::Yaml.load 'env: !decrypted "foo"' }
+    it { should_not be_encrypted }
+    it { should     be_decrypted }
+
+    context 'its value' do
+      subject(:value) { config.env.matrix.first.value  }
+      it { should     be_a(Travis::Yaml::SecureString) }
+      it { should_not be_encrypted                     }
+      it { should     be_decrypted                     }
+    end
+
+    context 'after encryption' do
+      before { config.encrypt { |v| v.upcase } }
+      it { should be_encrypted }
+      it { should be_decrypted }
+
+      context 'its value' do
+        subject(:value) { config.env.matrix.first.value }
+        it { should be_encrypted }
+        it { should be_decrypted }
+
+        specify 'correct encrypted and decrypted value' do
+          expect(value.encrypted_string).to be == 'FOO'
+          expect(value.decrypted_string).to be == 'foo'
+        end
+      end
+    end
+  end
+
+  context 'encrypted value in secure mapping with decrypted tag' do
+    subject(:config) { Travis::Yaml.load 'env: { secure: !decrypted "foo" }' }
+    it { should_not be_encrypted }
+    it { should     be_decrypted }
+
+    context 'its value' do
+      subject(:value) { config.env.matrix.first.value  }
+      it { should     be_a(Travis::Yaml::SecureString) }
+      it { should_not be_encrypted                     }
+      it { should     be_decrypted                     }
+    end
+  end
+
+  specify 'in an unexpected place' do
+    config = Travis::Yaml.load('language: { secure: ruby }')
+    expect(config.warnings).to include('dropping "language" section: "secure" not supported, dropping "ruby"')
+  end
+
+  specify 'secure cannot be a key in an open mapping' do
+    config = Travis::Yaml.load <<-YAML.gsub(/^      /, "")
+      language: python
+      python:
+        - 2.7
+
+      deploy:
+        provider: heroku
+        strategy: git
+        api_key:
+        secure:
+          secure: |-
+             SECRET HERE
+    YAML
+
+    deploy = config.deploy.first
+    expect(deploy[:secure]).to be_nil
+    expect(deploy.warnings).to include('unexpected key "secure", dropping')
+  end
+
+  specify 'secure cannot be nested' do
+    config = Travis::Yaml.load <<-YAML.gsub(/^      /, "")
+      language: python
+      python:
+        - 2.7
+
+      deploy:
+        provider: heroku
+        strategy: git
+        api_key:
+          secure:
+            secure: |-
+              SECRET HERE
+    YAML
+
+    deploy = config.deploy.first
+    expect(deploy[:api_key]).to be_nil
+    expect(deploy.warnings).to include('dropping "api_key" section: secret value needs to be a string')
+  end
+end

data/spec/parser/psych_spec.rb

@@ -0,0 +1,6 @@
+describe Travis::Yaml::Parser::Psych do
+  example "does not rely on visit_unexpected raising an exception" do
+    expect { Travis::Yaml.load("cache: [bundler, { directories: [test/feature_files] }]") }.
+      not_to raise_error
+  end
+end

data/spec/parser/ruby_spec.rb

@@ -1,5 +1,5 @@
 describe Travis::Yaml::Parser::Ruby do
-  subject { described_class }
+  subject { Travis::Yaml::Parser::Ruby }
   let(:secure_string) { Travis::Yaml::SecureString.new("") }
   let(:input) {{ ruby: ['2.0.0', :jruby, 10, 4.2, Time.now, false, nil, secure_string, Object.new] }}
 

data/spec/serializer/json_spec.rb

@@ -0,0 +1,30 @@
+describe Travis::Yaml::Serializer::Json do
+  subject(:config) { Travis::Yaml.parse('env: [{ secure: "foo" }, "bar"]') }
+
+  example "serializes json" do
+    expect(config.serialize(:json)).to be == '{"env":{"matrix":[{"secure":"foo"},"bar"]},"language":"ruby","os":["linux"]}'
+  end
+
+  example "does work properly with symbol keys option" do
+    expect(config.serialize(:json, symbol_keys: true)).to be == '{"env":{"matrix":[{"secure":"foo"},"bar"]},"language":"ruby","os":["linux"]}'
+  end
+
+  example "serializes pretty json" do
+    expect(config.serialize(:json, pretty: true)).to be ==
+      "{\n  \"env\": {\n    \"matrix\": [\n      {\"secure\": \"foo\"},\n      \"bar\"\n    ]\n  },\n  \"language\": \"ruby\",\n  \"os\": [ \"linux\" ]\n}"
+  end
+
+  example "complains about decrypted values missing" do
+    expect { config.serialize(:json, secure: :decrypted) }.to raise_error(ArgumentError, 'secure option is set decrypted, but a secure value is not decrypted')
+  end
+
+  example "serializes decrypted values" do
+    config.decrypt { |*| "x" }
+    expect(config.serialize(:json, secure: :encrypted)).to be == '{"env":{"matrix":[{"secure":"foo"},"bar"]},"language":"ruby","os":["linux"]}'
+    expect(config.serialize(:json, secure: :decrypted)).to be == '{"env":{"matrix":["x","bar"]},"language":"ruby","os":["linux"]}'
+  end
+
+  example "is exposed via to_json" do
+    expect(config.serialize(:json)).to be == config.to_json
+  end
+end

data/spec/serializer/legacy_spec.rb

@@ -0,0 +1,47 @@
+describe Travis::Yaml::Serializer::Legacy do
+  subject(:config) { Travis::Yaml.parse('env: [{ secure: "foo" }, "bar"]') }
+
+  example "serializes to legacy ruby" do
+    expect(config.serialize(:legacy)).to be == {
+      "env"=>{"matrix"=>[{"secure"=>"foo"}, "bar"]},
+      "language"=>"ruby", "os"=>["linux"],
+      ".result"=>"configured",
+      ".result_warnings"=>[[[], "missing key \"language\", defaulting to \"ruby\""]]
+    }
+  end
+
+  example "serializes to legacy ruby" do
+    expect(config.serialize(:legacy, symbol_keys: true)).to be == {
+      :env=>{:matrix=>[{:secure=>"foo"}, "bar"]},
+      :language=>"ruby", :os=>["linux"],
+      :".result"=>"configured",
+      :".result_warnings"=>[[[], "missing key \"language\", defaulting to \"ruby\""]]
+    }
+  end
+
+  example "complains about decrypted values missing" do
+    expect { config.serialize(:legacy, secure: :decrypted) }.to raise_error(ArgumentError, 'secure option is set decrypted, but a secure value is not decrypted')
+  end
+
+  example "serializes decrypted values" do
+    config.decrypt { |*| "x" }
+
+    expect(config.serialize(:legacy, secure: :encrypted)).to be == {
+      "env"=>{"matrix"=>[{"secure"=>"foo"}, "bar"]},
+      "language"=>"ruby", "os"=>["linux"],
+      ".result"=>"configured",
+      ".result_warnings"=>[[[], "missing key \"language\", defaulting to \"ruby\""]]
+    }
+
+    expect(config.serialize(:legacy, secure: :decrypted)).to be == {
+      "env"=>{"matrix"=>["x", "bar"]},
+      "language"=>"ruby", "os"=>["linux"],
+      ".result"=>"configured",
+      ".result_warnings"=>[[[], "missing key \"language\", defaulting to \"ruby\""]]
+    }
+  end
+
+  example "is exposed via to_legacy_ruby" do
+    expect(config.serialize(:legacy)).to be == config.to_legacy_ruby
+  end
+end

data/spec/serializer/ruby_spec.rb

@@ -0,0 +1,21 @@
+describe Travis::Yaml::Serializer::Ruby do
+  subject(:config) { Travis::Yaml.parse('env: [{ secure: "foo" }, "bar"]') }
+
+  example "serializes to ruby objects" do
+    expect(config.serialize(:ruby)).to be == {
+      "env"=>{"matrix"=>[Travis::Yaml::SecureString.new("foo"), "bar"]},
+      "language"=>"ruby", "os"=>["linux"]
+    }
+  end
+
+  example "serializes symbol keys" do
+    expect(config.serialize(:ruby, symbol_keys: true)).to be == {
+      env: { matrix: [Travis::Yaml::SecureString.new("foo"), "bar"]},
+      language: "ruby", os: ["linux"]
+    }
+  end
+
+  example "is exposed via to_ruby" do
+    expect(config.serialize(:ruby)).to be == config.to_ruby
+  end
+end

data/spec/serializer/yaml_spec.rb

@@ -0,0 +1,47 @@
+describe Travis::Yaml::Serializer::Yaml do
+  subject(:config) { Travis::Yaml.parse('env: [{ secure: "foo" }, "bar"]') }
+
+  example "serializes json" do
+    expect(config.serialize(:yaml).gsub("'", "")).to be ==
+      "---\nenv:\n  matrix:\n  - !encrypted foo\n  - bar\nlanguage: ruby\nos:\n- linux\n"
+  end
+
+  example "complains about decrypted values missing" do
+    expect { config.serialize(:yaml, secure: :decrypted) }.to raise_error(ArgumentError,
+      'secure option is set decrypted, but a secure value is not decrypted')
+  end
+
+  example "serializes decrypted values" do
+    config.decrypt { |*| "x" }
+
+    expect(config.serialize(:yaml, secure: :encrypted).gsub("'", "")).to be ==
+      "---\nenv:\n  matrix:\n  - !encrypted foo\n  - bar\nlanguage: ruby\nos:\n- linux\n"
+
+    expect(config.serialize(:yaml, secure: :decrypted).gsub("'", "")).to be ==
+      "---\nenv:\n  matrix:\n  - !decrypted x\n  - bar\nlanguage: ruby\nos:\n- linux\n"
+  end
+
+  example "avoid tags" do
+    config.decrypt { |*| "x" }
+
+    expect(config.serialize(:yaml, secure: :encrypted, avoid_tags: true).gsub("'", "")).to be ==
+      "---\nenv:\n  matrix:\n  - secure: foo\n  - bar\nlanguage: ruby\nos:\n- linux\n"
+
+    expect(config.serialize(:yaml, secure: :decrypted, avoid_tags: true).gsub("'", "")).to be ==
+      "---\nenv:\n  matrix:\n  - x\n  - bar\nlanguage: ruby\nos:\n- linux\n"
+  end
+
+  example "indentation" do
+    expect(config.serialize(:yaml, indentation: 3).gsub("'", "")).to be ==
+      "---\nenv:\n   matrix:\n   - !encrypted foo\n   - bar\nlanguage: ruby\nos:\n- linux\n"
+  end
+
+  example "symbol keys" do
+    expect(config.serialize(:yaml, symbol_keys: true).gsub("'", "")).to be ==
+      "---\n:env:\n  :matrix:\n  - !encrypted foo\n  - bar\n:language: ruby\n:os:\n- linux\n"
+  end
+
+  example "is exposed via to_yaml" do
+    expect(config.serialize(:yaml)).to be == config.to_yaml
+  end
+end

data/spec/support/coverage.rb

@@ -1,11 +1,11 @@
-require 'simplecov'
+unless defined? RUBY_ENGINE and RUBY_ENGINE == 'jruby'
+  require 'simplecov'
+  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
 
-SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
-
-SimpleCov.start do
-  project_name 'travis-yaml'
-  coverage_dir '.coverage'
-
-  add_filter "/spec/"
-  add_group 'Library', 'lib'
+  SimpleCov.start do
+    project_name 'travis-yaml'
+    coverage_dir '.coverage'
+    add_filter '/spec/'
+    add_group 'Library', 'lib'
+  end
 end

data/spec/yaml_spec.rb

@@ -5,6 +5,13 @@ describe Travis::Yaml do
     Travis::Yaml.parse! ""
   end
 
+  specify :parse do
+    config = Travis::Yaml.parse('env: { secure: foo }') do |yaml|
+      yaml.decrypt { |value| value }
+    end
+    expect(config).to be_decrypted
+  end
+
   describe :new do
     specify 'with block' do
       config = Travis::Yaml.new { |c| c.language = 'php' }
@@ -23,4 +30,20 @@ describe Travis::Yaml do
     config = Travis::Yaml.parse(rvm: ['jruby', '2.0.0'], language: :ruby)
     expect(config.inspect).to be == '#<Travis::Yaml:{"ruby"=>["jruby", "2.0.0"], "language"=>"ruby", "os"=>"linux"}>'
   end
+
+  context :with_value do
+    subject(:config) { Travis::Yaml.parse(rvm: ['jruby', '2.0.0'], language: :ruby) }
+    
+    example "with_value for language" do
+      changed = config.with_value(language: :php)
+      expect(changed.language) .to be == "php"
+      expect(config.language)  .to be == "ruby"
+    end
+
+    example "with_value for rvm" do
+      changed = config.with_value(rvm: :jruby)
+      expect(changed.rvm) .to be == "jruby"
+      expect(config.rvm)  .to be == ['jruby', '2.0.0']
+    end
+  end
 end

data/travis-yaml.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email                 = "contact@travis-ci.com"
   s.homepage              = "https://github.com/travis-ci/travis-yaml"
   s.summary               = %q{parses your .travis.yml}
-  s.description           = %q{parses and validates your .travis.yml, fast ans secure}
+  s.description           = %q{parses and validates your .travis.yml, fast and secure}
   s.license               = 'MIT'
   s.files                 = `git ls-files`.split("\n")
   s.test_files            = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'psych', '~> 2.0'
-  s.add_development_dependency 'rspec', '~> 3.0.0.beta'
+  s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'safe_yaml', '~> 1.0.1'

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: travis-yaml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Travis CI GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-description: parses and validates your .travis.yml, fast ans secure
+description: parses and validates your .travis.yml, fast and secure
 email: contact@travis-ci.com
 executables: []
 extensions: []
@@ -96,10 +82,11 @@ files:
 - Rakefile
 - SPEC.md
 - bench/parser_bench.rb
-- config.ru
 - lib/travis/yaml.rb
 - lib/travis/yaml/matrix.rb
 - lib/travis/yaml/nodes.rb
+- lib/travis/yaml/nodes/addons.rb
+- lib/travis/yaml/nodes/android.rb
 - lib/travis/yaml/nodes/branches.rb
 - lib/travis/yaml/nodes/bundler_args.rb
 - lib/travis/yaml/nodes/cache.rb
@@ -108,9 +95,11 @@ files:
 - lib/travis/yaml/nodes/deploy.rb
 - lib/travis/yaml/nodes/deploy_conditions.rb
 - lib/travis/yaml/nodes/deploy_entry.rb
+- lib/travis/yaml/nodes/dist.rb
 - lib/travis/yaml/nodes/env.rb
 - lib/travis/yaml/nodes/fixed_value.rb
 - lib/travis/yaml/nodes/git.rb
+- lib/travis/yaml/nodes/group.rb
 - lib/travis/yaml/nodes/jdk.rb
 - lib/travis/yaml/nodes/language.rb
 - lib/travis/yaml/nodes/language_specific.rb
@@ -134,26 +123,44 @@ files:
 - lib/travis/yaml/parser/psych.rb
 - lib/travis/yaml/parser/ruby.rb
 - lib/travis/yaml/secure_string.rb
+- lib/travis/yaml/serializer.rb
+- lib/travis/yaml/serializer/generic.rb
+- lib/travis/yaml/serializer/json.rb
+- lib/travis/yaml/serializer/legacy.rb
+- lib/travis/yaml/serializer/ruby.rb
+- lib/travis/yaml/serializer/yaml.rb
 - lib/travis/yaml/version.rb
 - play/lint.rb
 - play/spec.rb
-- play/weblint.rb
+- spec/matrix_spec.rb
 - spec/nodes/.rb
+- spec/nodes/addons_spec.rb
 - spec/nodes/branches_spec.rb
 - spec/nodes/bundler_args_spec.rb
 - spec/nodes/cache_spec.rb
 - spec/nodes/compiler_spec.rb
 - spec/nodes/deploy_spec.rb
+- spec/nodes/dist_spec.rb
+- spec/nodes/env_spec.rb
 - spec/nodes/git_spec.rb
+- spec/nodes/group_spec.rb
 - spec/nodes/jdk_spec.rb
 - spec/nodes/language_spec.rb
+- spec/nodes/node_js_spec.rb
 - spec/nodes/notifications_spec.rb
 - spec/nodes/os_spec.rb
+- spec/nodes/root_spec.rb
 - spec/nodes/ruby_spec.rb
+- spec/nodes/secure_spec.rb
 - spec/nodes/stage_spec.rb
 - spec/nodes/virtual_env_spec.rb
 - spec/parser/dummy_spec.rb
+- spec/parser/psych_spec.rb
 - spec/parser/ruby_spec.rb
+- spec/serializer/json_spec.rb
+- spec/serializer/legacy_spec.rb
+- spec/serializer/ruby_spec.rb
+- spec/serializer/yaml_spec.rb
 - spec/support.rb
 - spec/support/coverage.rb
 - spec/support/environment.rb
@@ -179,27 +186,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: parses your .travis.yml
 test_files:
+- spec/matrix_spec.rb
 - spec/nodes/.rb
+- spec/nodes/addons_spec.rb
 - spec/nodes/branches_spec.rb
 - spec/nodes/bundler_args_spec.rb
 - spec/nodes/cache_spec.rb
 - spec/nodes/compiler_spec.rb
 - spec/nodes/deploy_spec.rb
+- spec/nodes/dist_spec.rb
+- spec/nodes/env_spec.rb
 - spec/nodes/git_spec.rb
+- spec/nodes/group_spec.rb
 - spec/nodes/jdk_spec.rb
 - spec/nodes/language_spec.rb
+- spec/nodes/node_js_spec.rb
 - spec/nodes/notifications_spec.rb
 - spec/nodes/os_spec.rb
+- spec/nodes/root_spec.rb
 - spec/nodes/ruby_spec.rb
+- spec/nodes/secure_spec.rb
 - spec/nodes/stage_spec.rb
 - spec/nodes/virtual_env_spec.rb
 - spec/parser/dummy_spec.rb
+- spec/parser/psych_spec.rb
 - spec/parser/ruby_spec.rb
+- spec/serializer/json_spec.rb
+- spec/serializer/legacy_spec.rb
+- spec/serializer/ruby_spec.rb
+- spec/serializer/yaml_spec.rb
 - spec/support.rb
 - spec/support/coverage.rb
 - spec/support/environment.rb