Talkdesk · sashaafm · Nov 26, 2016 · Nov 27, 2016 · Dec 1, 2016 · Jan 2, 2017
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,41 @@
-.rebar3
-_build
-.DS_Store
-generated.config
-generated.conf
-ebin/*
-.eunit
-deps
-cuttlefish
+# rebar and tools
+*.crashdump
+.cache/
+.rebar3/
+_build/
+_checkouts
+rebar.lock
+log/
+
+# work environments
+*.bak
+*.dump
+*.iml
+*.plt
 *.sublime-project
 *.sublime-workspace
-log
-.local_dialyzer_plt
+*.tmp
+*.txt
+*_plt
+*~
+.DS_Store
+.idea/
+.project
+.settings/
+.tm_properties
 erln8.config
+tmp/
+
+# Erlang artifacts
+*.app
+*.beam
+/doc/
+/ebin/
+
+# build/test artifacts
+/cuttlefish
+generated.conf
+generated.config
+src/conf_parse.erl
+src/cuttlefish_duration_parse.erl
 test_fixtures/escript_prune_test/generated.config/*
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: erlang
+otp_release:
+  - 20.3.8
+  - 21.3
+  - 22.3
+script:
+  - chmod u+x rebar3
+  - ./rebar3 do upgrade, compile, xref, dialyzer, eunit
diff --git a/Makefile b/Makefile
@@ -0,0 +1,111 @@
+# -------------------------------------------------------------------
+#
+# Copyright (c) 2013-2017 Basho Technologies, Inc.
+#
+# This file is provided to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain
+# a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# -------------------------------------------------------------------
+
+prj_dir	:= $(CURDIR)
+cache	:= $(prj_dir)/.cache
+
+dl_tgts	:=
+#
+# tools
+#
+ifeq ($(REBAR3),)
+REBAR3	:= $(cache)/rebar3
+dl_tgts	+= $(REBAR3)
+endif
+export	REBAR3
+CP	:= /bin/cp -p
+RM	:= /bin/rm
+
+.PHONY	: check clean clean-deps clean-docs clean-dist compile dialyzer \
+	  default docs escript prereqs test validate veryclean xref
+
+default : compile
+
+prereqs ::
+
+compile :: prereqs
+	$(REBAR3) as prod compile
+
+check :: prereqs
+	$(REBAR3) as check do brt-deps --check, dialyzer, xref
+
+clean :: prereqs
+	$(REBAR3) clean --all
+
+clean-deps :: clean
+	$(RM) -rf $(prj_dir)/_build
+
+clean-docs ::
+	$(REBAR3) as docs clean
+
+clean-dist ::
+	$(RM) -f $(prj_dir)/cuttlefish
+
+docs :: prereqs
+	$(REBAR3) edoc
+
+dialyzer :: prereqs
+	$(REBAR3) as check dialyzer
+
+escript :: prereqs
+	$(REBAR3) as prod escriptize
+	$(CP) _build/prod/bin/cuttlefish $(prj_dir)/cuttlefish
+
+test :: prereqs
+	$(REBAR3) eunit
+
+validate :: prereqs
+	$(REBAR3) as validate compile
+
+veryclean :: clean clean-docs clean-deps clean-dist
+	$(RM) -rf $(cache)
+
+xref :: prereqs
+	$(REBAR3) as check xref
+
+#
+# how to download files if we need to
+#
+ifneq ($(dl_tgts),)
+
+dlcmd	:= $(shell which wget 2>/dev/null || true)
+ifneq ($(wildcard $(dlcmd)),)
+dlcmd	+= -O
+else
+dlcmd	:= $(shell which curl 2>/dev/null || true)
+ifneq ($(wildcard $(dlcmd)),)
+dlcmd	+= -o
+else
+$(error Need wget or curl to download files)
+endif
+endif
+
+prereqs :: $(dl_tgts)
+
+veryclean ::
+	$(RM) -rf $(dl_tgts)
+
+$(cache)/rebar3 :
+	@test -d $(@D) || /bin/mkdir -p $(@D)
+	@echo Downloading $@ ...
+	@$(dlcmd) $@ https://s3.amazonaws.com/rebar3/rebar3
+	@/bin/chmod +x $@
+
+endif	# dl_tgts
diff --git a/README.md b/README.md
@@ -1,10 +1,21 @@
 # Cuttlefish
 
+[![Build Status](https://travis-ci.org/Kyorai/cuttlefish.svg?branch=develop)](https://travis-ci.org/Kyorai/cuttlefish)
+[![Build status (windows)](https://ci.appveyor.com/api/projects/status/lo8ssrixiqmufc3j?svg=true)](https://ci.appveyor.com/project/Licenser/cuttlefish)
+[![Coverage Status](https://coveralls.io/repos/github/Kyorai/cuttlefish/badge.svg?branch=master)](https://coveralls.io/github/Kyorai/cuttlefish)
+[![Hex version](https://img.shields.io/hexpm/v/cuttlefish.svg "Hex version")](https://hex.pm/packages/cuttlefish)
+
 Cuttlefish is a library for Erlang applications that wish to walk the
 fine line between Erlang `app.config`s and a sysctl-like syntax.
 The name is a pun on the pronunciation of 'sysctl' and jokes are
 better explained.
 
+This repository retains full history of the original repository, [basho/cuttlefish/](https://github.com/basho/cuttlefish/),
+but intentionally cut ties with that repo to avoid confusion as to
+where is the most up-to-date, maintained version is.
+
+This is the repository used to produce [Hex.pm releases](https://hex.pm/packages/cuttlefish) of the project.
+
 ## Riak Disclaimer
 
 While this readme and test suite is Riak-heavy, the fact is that this
@@ -88,7 +99,14 @@ https://github.com/basho/cuttlefish/wiki/Cuttlefish-for-Application-Users
 * [node_package](https://github.com/basho/cuttlefish/wiki/Cuttlefish-for-node_package-users)
 * [non node_package](https://github.com/basho/cuttlefish/wiki/Cuttlefish-for-non-node_package-users)
 
-
 ## Current Status
 
 Cuttlefish is ready for production deployments.
+
+## Re-generating parser
+
+```
+rebar3 as dev neotoma
+```
+
+Please see the *NOTE* in `src/conf_parse.peg` as well.
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,9 @@
+build: off
+
+install:
+  - curl -OL https://s3.amazonaws.com/rebar3/rebar3
+
+test_script:
+  - escript ./rebar3 do compile,eunit,dialyzer
+
+deploy: false
diff --git a/rebar.config b/rebar.config
@@ -1,20 +1,35 @@
-{minimum_otp_vsn, "R16"}.
+{minimum_otp_vsn, "20"}.
 
 {erl_opts, [warnings_as_errors,
             {parse_transform, lager_transform},
             debug_info,
             warn_untyped_record]}.
 
-{deps, [getopt, {lager, "~>3.6.0"}]}.
+{deps, [
+  {lager, {git, "git://github.com/erlang-lager/lager.git", {tag, "3.8.0"}}},
+  {getopt, {git, "git://github.com/jcomellas/getopt.git", {tag, "v1.0.1"}}}]}.
 
 {escript_emu_args, "%%! -escript main cuttlefish_escript +S 1 +A 0\n"}.
-{escript_incl_apps, [goldrush, getopt, lager, cuttlefish]}.
+{escript_incl_apps, [getopt, lager, cuttlefish]}.
 {escript_main_app, cuttlefish}.
 
-{provider_hooks, [{post, [{compile, {default, escriptize}}]}]}.
+% {provider_hooks, [{post, [{compile, {default, escriptize}}]}]}.
+
+{xref_checks, [
+    undefined_function_calls,
+    undefined_functions,
+    locals_not_used,
+    deprecated_function_calls,
+    deprecated_functions
+]}.
 
 {eunit_opts, [verbose]}.
 {cover_enabled, true}.
+{cover_print_enabled, true}.
+{cover_export_enabled, true}.
 
 {profiles, [{dev, [{deps, [neotoma]},
-                   {plugins, [rebar3_neotoma_plugin]}]}]}.
+                   {plugins, [rebar3_neotoma_plugin]}]},
+            {test, [{deps, [bbmustache]}]}]}.
+
+
diff --git a/rebar.config.script b/rebar.config.script
@@ -0,0 +1,15 @@
+%% vim:ft=erlang:
+
+case os:getenv("TRAVIS_JOB_ID") of
+    false -> CONFIG;
+    JobId ->
+        %% coveralls.io.
+        [{plugins, [{coveralls,
+                     {git, "https://github.com/markusn/coveralls-erl",
+                      {branch, "master"}}}]}
+        ,{coveralls_coverdata, "_build/test/cover/eunit.coverdata"}
+        ,{coveralls_service_name, "travis-ci"}
+        ,{coveralls_service_job_id, JobId}
+         |CONFIG
+        ]
+end.
diff --git a/rebar.lock b/rebar.lock
diff --git a/rebar3 b/rebar3
diff --git a/src/conf_parse.erl b/src/conf_parse.erl
@@ -17,9 +17,7 @@
 
 %% -------------------------------------------------------------------
 %%
-%% conf_parse: for all your .conf parsing needs.
-%%
-%% Copyright (c) 2013 Basho Technologies, Inc.  All Rights Reserved.
+%% Copyright (c) 2013-2017 Basho Technologies, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -36,10 +34,13 @@
 %% under the License.
 %%
 %% -------------------------------------------------------------------
+%%
+%% This is a generated file, changes should be made to conf_parse.peg.
+%%
 
-%% This module implements the parser for a sysctl-style
-%% configuration format. Example:
+%% This module implements the parser for a sysctl-style configuration format.
 %%
+%% Example:
 %% ```
 %% riak.local.node = riak@127.0.0.1
 %% riak.local.http = 127.0.0.1:8098
@@ -56,17 +57,18 @@
 %%
 %% Other modules in this application interpret and validate the
 %% result of a successful parse.
-%% @end
+%%
+
 -define(line, true).
 -define(FMT(F,A), lists:flatten(io_lib:format(F,A))).
 
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
--compile(export_all).
 -endif.
 
 %% @doc Only let through lines that are not comments or whitespace.
 is_setting(ws) -> false;
+is_setting([ws]) -> false;
 is_setting(comment) -> false;
 is_setting(_) -> true.
 
@@ -79,7 +81,7 @@ unescape_dots([C|Rest]) ->
 
 -ifdef(TEST).
 file_test() ->
-    Conf = conf_parse:file("../test/riak.conf"),
+    Conf = conf_parse:file(cuttlefish_test_util:test_file("riak.conf")),
     ?assertEqual([
             {["ring_size"],"32"},
             {["anti_entropy"],"debug"},
@@ -92,18 +94,35 @@ file_test() ->
     ok.
 
 utf8_test() ->
-    Conf = conf_parse:parse("setting = thingŒ\n"),
+    Conf = conf_parse:parse("setting = thing" ++ [338] ++ "\n"),
     ?assertEqual([{["setting"],
             {error, {conf_to_latin1, 1}}
         }], Conf),
     ok.
+
+gh_1_two_tab_test() ->
+    Conf = conf_parse:parse("setting0 = thing0\n\t\t\nsetting1 = thing1\n"),
+    ?assertEqual([
+            {["setting0"],"thing0"},
+            {["setting1"],"thing1"}
+        ], Conf),
+    ok.
+
+gh_1_three_tab_test() ->
+    Conf = conf_parse:parse("setting0 = thing0\n\t\t\t\nsetting1 = thing1\n"),
+    ?assertEqual([
+            {["setting0"],"thing0"},
+            {["setting1"],"thing1"}
+        ], Conf),
+    ok.
+
 -endif.
 
 -spec file(file:name()) -> any().
 file(Filename) -> case file:read_file(Filename) of {ok,Bin} -> parse(Bin); Err -> Err end.
 
 -spec parse(binary() | list()) -> any().
-parse(List) when is_list(List) -> parse(list_to_binary(List));
+parse(List) when is_list(List) -> parse(unicode:characters_to_binary(List));
 parse(Input) when is_binary(Input) ->
   _ = setup_memo(),
   Result = case 'config'(Input,{{line,1},{column,1}}) of
@@ -172,7 +191,7 @@ parse(Input) when is_binary(Input) ->
 
 -spec 'ws'(input(), index()) -> parse_result().
 'ws'(Input, Index) ->
-  p(Input, Index, 'ws', fun(I,D) -> (p_charclass(<<"[\s\t]">>))(I,D) end, fun(_Node, _Idx) ->ws end).
+  p(Input, Index, 'ws', fun(I,D) -> (p_one_or_more(p_charclass(<<"[\s\t]">>)))(I,D) end, fun(_Node, _Idx) ->ws end).