Commit Graph

507 Commits

Author SHA1 Message Date
Havoc Pennington
90d39831a0 Shrink previous patch to skip non-string Properties
There was some extra/leftover logic in there. With this commit
the diff vs. the original codebase is smaller and clearer.
2014-05-02 10:31:57 -04:00
萧岳
1336751ab6 Handle non-String values in a Properties object
The java docs for Properties say avoid this, but
it is possible, so just silently skip any non-strings
we find in the Properties.

Fixes #147
2014-05-02 10:30:29 -04:00
Havoc Pennington
5899bce827 Add paranoia about ClassLoader in ConfigParseOptions
Fixes #155. Really this is kind of a mess; having overloads
with both ClassLoader and ConfigParseOptions parameters, when
the parse options may include a class loader, confuses the
heck out of things.

Trying to make it so that the ConfigParseOptions variants are
the canonical version, and the ones with a loader just immediately
set the loader on the parse options and call the variant with no
loader parameter.

Anyway ... when it fails this patch should at least make it much
clearer what went wrong.
2014-05-02 09:59:31 -04:00
Havoc Pennington
6c2889728e Move table of contents below overview 2014-05-02 09:02:53 -04:00
Havoc Pennington
6eefb61b5e Organize README and add doctoc table of contents 2014-05-02 09:00:25 -04:00
Havoc Pennington
48a9437513 Go on a bit longer about how to handle defaults in the README 2014-05-01 20:23:13 -04:00
Havoc Pennington
bfe83e1b79 Throw exceptions when we need a reference to an array element
This arose in issue https://github.com/typesafehub/config/issues/160

There are two known cases: when we want to relativize references
in included files, and when we use `+=` while inside a list.
Both of those are currently impossible to handle without a way
to generate a reference to a list element.
2014-05-01 11:19:39 -04:00
Havoc Pennington
44e8a925b2 Fix Tokens.Value.toString on unresolved values
It was throwing an exception trying to unwrap unresolved value
2014-05-01 11:13:50 -04:00
Havoc Pennington
e5cc23235f Use fullCurrentPath() when relativizing includes, and make it throw if path is empty
This is just to consolidate our use of pathStack in one place.
2014-05-01 10:15:44 -04:00
Havoc Pennington
36c1392028 Merge pull request #150 from cprice404/add-ruby-port-link-to-README
Add link to ruby port in README
2014-03-16 22:55:27 -04:00
Chris Price
3df982e7af Add link to ruby port in README 2014-03-16 18:33:34 -07:00
Havoc Pennington
e1d59dc48c Wrap ConfigOrigin.comments in unmodifiableList
This prevents people from messing with the returned list.
2014-02-19 11:31:33 -05:00
Havoc Pennington
0f4508cc67 Add more mentions of paths vs. keys to the API docs. 2014-02-13 15:17:09 -05:00
Havoc Pennington
d5924b6d01 Merge pull request #143 from typesafehub/wip/havocp-invalidate-tests
Add tests for cache invalidation with ref config and full config
2014-02-11 19:15:48 -05:00
Havoc Pennington
a0c22c3687 Add tests for cache invalidation with ref config and full config 2014-02-11 17:51:10 -05:00
Havoc Pennington
49770d9290 Merge pull request #141 from typesafehub/fix/havocp-140
Handle a concatenation that doesn't resolve
2014-02-10 16:38:46 -05:00
Havoc Pennington
91e5e81995 Handle a concatenation that doesn't resolve
Fixes #140
2014-02-10 15:59:08 -05:00
Havoc Pennington
f3cb6b1504 Add .travis.yml 2014-02-10 15:58:19 -05:00
Havoc Pennington
f27265b3f5 Merge pull request #138 from fnuecke/master
Added ConfigRenderOptions entry for value sorting in objects.
2014-02-05 15:16:45 -05:00
Florian Nücke
b38e7085d4 Reverted config entry, always sorting keys when rendering in SimpleConfigObject now. 2014-02-05 20:58:06 +01:00
Florian Nücke
e51bb7e118 Added new ConfigRenderOptions entry to control whether to sort value in objects. 2014-02-03 18:53:14 +01:00
Havoc Pennington
9c3907715c Merge pull request #137 from jkinkead/fix_nested_includes
Fix nested includes.
2014-01-30 10:10:08 -08:00
Jesse Kinkead
366ab55582 Use the proper stack ordering when building a nested path in the Parser. 2014-01-29 13:30:37 -08:00
Jesse Kinkead
07c67aed2e Update test10.conf to trigger issue #136. 2014-01-29 13:06:01 -08:00
Havoc Pennington
2ff0e15cd4 1.2.0 in NEWS and README 2014-01-15 09:59:24 -05:00
Havoc Pennington
868c4928b3 Export impl package to OSGI
Fixes #49
2014-01-15 09:57:42 -05:00
Havoc Pennington
e6c7e6bd5b Some other README edits and updates 2014-01-10 19:39:48 -05:00
Havoc Pennington
bc7e0cfa29 give an example of env var substitution 2014-01-10 19:24:06 -05:00
Havoc Pennington
ebc1ca08fe Fix a couple of minor docs errors 2014-01-10 19:22:20 -05:00
Havoc Pennington
a6e4099a5c Add a note on serialization/rendering to Config docs 2014-01-08 14:46:00 -05:00
Havoc Pennington
6eb8176d92 Add 1.1.0-4dd6c85cab1ef1a4415abb74704d60e57497b7b8 to NEWS 2014-01-08 11:02:51 -05:00
Havoc Pennington
4dd6c85cab make getDuration return unboxed long
This way it's clear it can't be null
2014-01-08 10:44:44 -05:00
Havoc Pennington
42933ebc99 Switch to sbt 0.13.1 from 0.13.0 2014-01-08 10:44:29 -05:00
Havoc Pennington
e61a677f58 Fix a broken example in the spec
3.14 as a key is "3" : { "14"
2014-01-07 15:13:45 -05:00
Havoc Pennington
b8349630b6 Force Java 1.6 when publishing 2014-01-07 12:20:24 -05:00
Havoc Pennington
e34f3f3a94 Remove javadoc -exclude option which apparently doesn't work
I'm not 100% sure what was up here; did it used to work and now
doesn't? Anyway, we just don't pass those sources to javadoc
anymore.
2014-01-07 12:12:55 -05:00
Havoc Pennington
c36a8b082f Lots of documentation tweaks.
Fix some since tags, reword/reformat various things.
Add some links. Make it nicer.
2014-01-07 12:01:16 -05:00
Havoc Pennington
83cb670051 Don't generate docs for "impl" package. 2014-01-07 11:47:31 -05:00
Havoc Pennington
f09acc5d68 Snapshot release NEWS for 1.1.0-9f31d6308e7ebbc3d7904b64ebb9f61f7e22a968 2014-01-06 15:29:44 -05:00
Havoc Pennington
9f31d6308e set git.baseVersion in ThisBuild not GlobalScope so it works
The git plugin sets in ThisBuild which overrides GlobalScope.
2014-01-06 15:26:18 -05:00
Havoc Pennington
b22e4e5d03 don't aggregate publishSigned/publishSignedLocal
We have to override all sbt-pgp stuff in .sbt files
because sbt-pgp uses plugin.settings and thus overrides
Build.scala configuration. So the no-op'ing of publishSigned
in some of the projects didn't work.
2014-01-06 15:13:49 -05:00
Havoc Pennington
576646308a fix up publishSigned configuration and ban plain publish 2014-01-06 14:39:21 -05:00
Havoc Pennington
adc1099ff1 Merge pull request #130 from typesafehub/wip/havocp-git-versioning
Switch to git-hash snapshots instead of SNAPSHOT snapshots
2014-01-06 11:02:35 -08:00
Havoc Pennington
1bb06fd1c4 Switch to git-hash snapshots instead of SNAPSHOT snapshots 2014-01-06 12:57:32 -05:00
Havoc Pennington
afe042b99b Merge pull request #127 from typesafehub/wip/havocp-render-tweaks
Rendering tweaks
2014-01-06 06:59:26 -08:00
Havoc Pennington
172aa72ea3 Merge pull request #129 from typesafehub/wip/havocp-config-load-nonexistent
Require config.file/resource/url to exist regardless of parse options
2014-01-06 06:59:10 -08:00
Havoc Pennington
1ab16b6a9c Merge pull request #126 from typesafehub/wip/havocp-test-missing-values
Add tests for keys with no value
2014-01-06 06:58:58 -08:00
Havoc Pennington
cf56fb6b27 Merge pull request #124 from typesafehub/wip/havocp-fine-resolve-control
Add better control over the resolution process
2014-01-06 06:58:39 -08:00
Havoc Pennington
e7c92a9fc2 Merge pull request #123 from typesafehub/wip/havocp-only-doc-main-lib
Disable doc publication and generation for examples and tests
2014-01-06 06:58:15 -08:00
Havoc Pennington
6b8cf618be Require config.file/resource/url to exist regardless of parse options
These are overriding what was set programmatically, so even if
the app wants to allow the config file to be missing normally,
since these were manually specified they should have to exist.
People get confused when they set a nonexistent file and it
silently doesn't work.

Fixes #97
2014-01-03 15:28:44 -05:00