Merge pull request #6 from artefactop/improve_travis

Move to rebar3

.gitignore

@@ -1,8 +1,18 @@
+.rebar3
+_*
 .eunit
-deps
 *.o
 *.beam
 *.plt
+*.swp
+*.swo
+.erlang.cookie
+ebin
+log
+erl_crash.dump
+.rebar
+logs
+_build
+*.plt
 *.iml
 .idea
-ebin

.travis.yml

@@ -1,9 +1,13 @@
 language: erlang
-script: rebar compile && rebar skip_deps=true eunit
 otp_release:
-  - 18.3
-  - 17.5
-  - 18.0
   - R16B03-1
-  - R15B02
-
+  - 17.1
+  - 18.3
+before_script:
+  - "./bootstrap_travis.sh"
+script: "./rebar3 eunit"
+deploy:
+  provider: script
+  script: scripts/hex.sh
+  on:
+    tags: true

bootstrap_travis.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+curl -O -L https://s3.amazonaws.com/rebar3/rebar3
+chmod +x rebar3
+./rebar3 update

rebar.config

@@ -1,8 +1,7 @@
 {erl_opts, [debug_info, {src_dirs, ["src"]}]}.
 
 {deps, [
-    {erlsha2, ".*", {git, "https://github.com/vinoski/erlsha2", "2.2.1"}},
-    {jsx, ".*", {git, "git://github.com/talentdeficit/jsx.git", "2.8.0"}}
+    {jsx,"2.8.0"}
 ]}.
 
 {cover_enabled, true}.

scripts/hex.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+## Setup hex user
+mkdir -p ~/.hex
+echo '{username,<<"'${HEX_USERNAME}'">>}.' > ~/.hex/hex.config
+echo '{key,<<"'${HEX_KEY}'">>}.' >> ~/.hex/hex.config
+
+## Add the rebar3 hex plugin to global
+mkdir -p ~/.config/rebar3
+echo '{plugins, [rebar3_hex]}.' > ~/.config/rebar3/rebar.config
+
+./rebar3 hex publish <<EOF
+y
+EOF

src/ejwt.app.src

@@ -1,13 +1,15 @@
 {application, ejwt,
-    [
-        {description, "Encode/decode JSON Web Token"},
-        {vsn, git},
-        {registered, [ejwt]},
-        {applications, [
-            kernel,
-            stdlib,
-            jsx,
-            erlsha2
-        ]},
-        {env, []}
-    ]}.
+  [
+    {description, "Encode/decode JSON Web Token"},
+    {vsn, "git"},
+    {registered, [ejwt]},
+    {applications, [
+        kernel,
+        stdlib,
+        jsx
+    ]},
+    {env, []},
+    {maintainers, ["Jose Luis Navarro"]},
+    {licenses, ["Apache"]},
+    {links, [{"Github", "https://github.com/artefactop/ejwt"}]}
+  ]}.

src/ejwt.erl

@@ -38,11 +38,11 @@ encode(Payload, Key, Algorithm) ->
 -spec get_mac(Key :: key(), Data :: binary(), Method :: binary()) -> binary().
 
 get_mac(Key, Data, ?HS256) ->
-    hmac:hmac256(Key, Data);
+    crypto:hmac(sha256, Key, Data);
 get_mac(Key, Data, ?HS384) ->
-    hmac:hmac384(Key, Data);
+    crypto:hmac(sha384, Key, Data);
 get_mac(Key, Data, ?HS512) ->
-    hmac:hmac512(Key, Data).
+    crypto:hmac(sha512, Key, Data).
 
 -spec decode(JWT :: binary()) -> list() | error.
 
@@ -69,4 +69,3 @@ decode(JWT, Key) ->
                     error
             end
     end.
-