proxes 0.9.1 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +5 -4
  3. data/Gemfile.deploy.lock +20 -15
  4. data/Gemfile.dev +1 -0
  5. data/README.md +8 -1
  6. data/deploy_docker.sh +4 -4
  7. data/docker-compose.yml +17 -0
  8. data/lib/proxes/version.rb +1 -1
  9. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 898750268ee2d37e251453f1a0107098a351bd0e18882d8298d099d54139d8fa
4
- data.tar.gz: b2edde09b68be4713a8154c2ae55c26281aa85ebab54976f20f76dae03eae398
3
+ metadata.gz: 23a733cd75da2400f2490d5586a3a8039e395bdede3ecdb8ac380d986a23c74e
4
+ data.tar.gz: 8c316a8c6f51a14ec99c381594b1755b54064426d3885669fa0c77f40b1b2ad4
5
5
  SHA512:
6
- metadata.gz: 3aed376fdbde056ad0f4d0db842c53433564ffa888e34e61d921cb80e64fa43a89fe7f37d0fe7e5554cc49e908de88416414578358614bb17590c876d72bf1d5
7
- data.tar.gz: aa1a7cde1f05ad6ef23a5c8233f03c2c1a156857885be75697b7937825bdbcaa9fa398b3db474f7bc9ea18946eb659ef60683d6660a76b2d00acb1ef92b22c2f
6
+ metadata.gz: 45bdf16dc25e971b2b7b0ff43f7e6cf1f49fe8d9d62a8b3ba7b28a846734a775b7d416dfbfbc07057ac79768308abb7ea114d3a35bc4e0dbe91961e044c463e3
7
+ data.tar.gz: c104db7338a96b33a5a44b46d2b92d90ad531b8335fe2864669014524f0cbfc151a51a7fe4ec00efa723eba1e8925432ff036d115fceb85d9424801ebb7fba73
data/.travis.yml CHANGED
@@ -1,4 +1,4 @@
1
- sudo: false
1
+ sudo: true
2
2
  language: ruby
3
3
  rvm:
4
4
  - 2.5.0
@@ -13,9 +13,10 @@ env:
13
13
  - secure: z4AUz0bssd0C7rfPsh71aH6ki8Zp49WZrYNRhj50MytJympFsEOYRVdVKuuAoq7jaD0cahIioDHrTf1J9bIOqMPc3l2lk9RFWA27Qk46C5zNxspnNBin0disEeO/AENlb5Zwe/Cqamg7Sc/NVpELPqUl8gHfX3FVv4Po3dZZWQb1d/pLXBpl84HGLWgFwz6ku+74XW6aqX1Qzd8G0s9gsqsAgUszwEX3ppltBrai1VdtZyFbv0XCOds3F687Ecyht3FJBQCOaTopPQztdmA8rBTPW+ffhfoZuQWfo8aILqmn9xCGr4vhMjwaOP7cVQdXcPs1ecsFBKFS0XRm5kJKBtBPLDfEc4zl6UIIe5xZBh5m0dysxu78ZoNFVui3QszyUP+dARf3AHsy1m3d8iRXMNEqKTTglKdPIdFKZLnWGoVSf+fidR7NIyJH7MGhr4VC8esGFGazzOXBnqVAX+z1tEse6n7llFcy0dREW0FNMpKMSP6TqN4LRiKXtRdSbeSvHXP3UiH6vPjAE/lHhf7qXSNOLkZDtCWrD0us4kT1ACeL2AV2SArJf7pmGdEL9pUyp4jSuStwxtRPhYJj2kuS6op9MYoU6Q8eyXhIw8Uju4SitGtkTnb8t5L50Xw7vUQT9faEah9ewJwB2kxa2RZxCdIzylwuYssCON4xkdXI1fY=
14
14
  - secure: lUfjVwbIxUBQTGkDTOSMNvSYONBwI5yObn8fCByzGkfleddWPjLEeMPjGBZboOu2CVZ/q/FG3xbn63Hmss7CU83FmWRoV5dMP9Yc7X7cHaGmi31mZcaY2Yah+jgx7PcNIdK8LOAB3/zhxDNOcr8U4O9gqxGZWnV2NLR8SB+KiNTg5Hou3nOeVw7l1Iz+h1hXvZfxkMv7aX/3TLMT8j2JMkfgCN8moMlNRAYnvm/B68FPcVs6UFcaZIwg2mBnq3FrARo127jG1Ozms2SOPTqkPY9y8yoGyo3TYH2iQOKdRxCCECBnkSO8HYRYTL9CUoMk/D4ZTp7TGNRIKxjHtlt+9O1WtfmZB2aevZX5c7ChCZ0wNhQpzlsyPDz0GoIOkms5Bfv7nsvbloejr+vsRxe8YsNaVAVG+9RVZziKxGCWsxTopfnFMfFBK7KIoJ4N60ijhtBr3qcYQbSeoZWviwSd/GCjl9I2d2mTPVI0DsiFVt8lP92ZZitPJEhPRcxHdHu47Wu7oftndcVqzhhgdGnOxMchYKgzccR17VWlactGxffJP+ZIUkHaWCkxVR4etcrE753uaUX9x+M1fMoKKrwvycstX/YWLncgsYM1YensRUN7oW87wk216anlKfHubO2aVeDNnXn+wszK87M12o9gFu1khTBowqZpXsVDaUaa+oc=
15
15
  matrix:
16
- - DATABASE_URL="sqlite::memory:" ELASTICSEARCH_URL="http://localhost:9200" RACK_ENV=test
16
+ - DATABASE_URL="sqlite::memory:" ELASTICSEARCH_URL="http://localhost:9200" RACK_ENV=test
17
17
  services:
18
18
  - elasticsearch
19
+ - docker
19
20
  before_install:
20
21
  - gem install bundler -v 1.12.5
21
22
  before_script:
@@ -36,9 +37,9 @@ deploy:
36
37
  tags: true
37
38
  repo: EagerELK/proxes
38
39
  - provider: script
39
- script: deploy_docker.sh
40
+ script: ./deploy_docker.sh
40
41
  on:
41
42
  tags: true
42
43
 
43
44
  after_success:
44
- - bundle exec codeclimate-test-reporter
45
+ - bundle exec codeclimate-test-reporter
data/Gemfile.deploy.lock CHANGED
@@ -6,12 +6,13 @@ GEM
6
6
  i18n (~> 0.7)
7
7
  minitest (~> 5.1)
8
8
  tzinfo (~> 1.1)
9
- backports (3.11.0)
9
+ backports (3.11.1)
10
10
  bcrypt (3.1.11)
11
11
  bcrypt-ruby (3.1.5)
12
12
  bcrypt (>= 3.1.3)
13
13
  concurrent-ruby (1.0.5)
14
- ditty (0.3.2)
14
+ connection_pool (2.2.1)
15
+ ditty (0.4.0)
15
16
  activesupport (>= 3)
16
17
  bcrypt (~> 3.1)
17
18
  haml (~> 5.0)
@@ -28,28 +29,30 @@ GEM
28
29
  tilt (>= 2)
29
30
  wisper (~> 2.0)
30
31
  dotenv (2.2.1)
31
- elasticsearch (6.0.0)
32
- elasticsearch-api (= 6.0.0)
33
- elasticsearch-transport (= 6.0.0)
34
- elasticsearch-api (6.0.0)
32
+ elasticsearch (6.0.1)
33
+ elasticsearch-api (= 6.0.1)
34
+ elasticsearch-transport (= 6.0.1)
35
+ elasticsearch-api (6.0.1)
35
36
  multi_json
36
- elasticsearch-transport (6.0.0)
37
+ elasticsearch-transport (6.0.1)
37
38
  faraday
38
39
  multi_json
39
- faraday (0.13.1)
40
+ faraday (0.14.0)
40
41
  multipart-post (>= 1.2, < 3)
41
42
  haml (5.0.4)
42
43
  temple (>= 0.8.0)
43
44
  tilt
44
45
  hashie (3.5.7)
45
46
  highline (1.7.10)
46
- i18n (0.9.1)
47
+ i18n (0.9.3)
47
48
  concurrent-ruby (~> 1.0)
48
49
  logger (1.2.8)
49
- minitest (5.11.1)
50
- multi_json (1.13.0)
50
+ minitest (5.11.3)
51
+ multi_json (1.13.1)
51
52
  multipart-post (2.0.0)
52
53
  mustermann (1.0.1)
54
+ net-http-persistent (3.0.0)
55
+ connection_pool (~> 2.2)
53
56
  omniauth (1.8.1)
54
57
  hashie (>= 3.4.6, < 3.6.0)
55
58
  rack (>= 1.6.2, < 3)
@@ -59,14 +62,16 @@ GEM
59
62
  bcrypt-ruby (~> 3.0)
60
63
  omniauth (~> 1.0)
61
64
  pg (1.0.0)
62
- proxes (0.8.4)
65
+ proxes (0.9.1)
63
66
  activesupport (>= 3)
64
67
  bcrypt (~> 3.1)
65
68
  ditty (>= 0.2)
66
69
  elasticsearch (>= 2)
70
+ faraday
67
71
  haml (~> 5.0)
68
72
  highline (~> 1.7)
69
73
  logger (~> 1.0)
74
+ net-http-persistent
70
75
  omniauth (~> 1.0)
71
76
  omniauth-http-basic (~> 1.0)
72
77
  omniauth-identity (~> 1.0)
@@ -79,10 +84,10 @@ GEM
79
84
  sinatra-flash (~> 0.3)
80
85
  tilt (>= 2)
81
86
  wisper (~> 2.0)
82
- puma (3.11.0)
87
+ puma (3.11.2)
83
88
  pundit (1.1.0)
84
89
  activesupport (>= 3.0.0)
85
- rack (2.0.3)
90
+ rack (2.0.4)
86
91
  rack-contrib (1.2.0)
87
92
  rack (>= 0.9.1)
88
93
  rack-protection (2.0.0)
@@ -106,7 +111,7 @@ GEM
106
111
  temple (0.8.0)
107
112
  thread_safe (0.3.6)
108
113
  tilt (2.0.8)
109
- tzinfo (1.2.4)
114
+ tzinfo (1.2.5)
110
115
  thread_safe (~> 0.1)
111
116
  wisper (2.0.0)
112
117
 
data/Gemfile.dev CHANGED
@@ -7,4 +7,5 @@ gem 'rerun', git: 'https://github.com/alexch/rerun.git', branch: 'master'
7
7
  gem 'sqlite3'
8
8
  gem 'simplecov'
9
9
  gem 'pry-byebug'
10
+ gem 'dotenv'
10
11
 
data/README.md CHANGED
@@ -37,11 +37,18 @@ ProxES has two [components](https://github.com/eagerelk/proxes#components) that
37
37
 
38
38
  ProxES can be run in a Docker container:
39
39
 
40
-
41
40
  ```bash
42
41
  docker run -e ELASTICSEARCH_URL=http://elasticsearch -e DATABASE_URL=postgres://username:password@database:5432/proxes --add-host=database:10.0.2.15 --add-host=elasticearch:10.0.2.15 eagerelk/proxes web-proxes
43
42
  ```
44
43
 
44
+ ### Docker Compose
45
+
46
+ The project includes a `docker-compose.yml` file that you can use to get it up and running quickly:
47
+
48
+ ```bash
49
+ docker-compose up
50
+ ```
51
+
45
52
  ## Components
46
53
 
47
54
  ProxES has two main components that works together, but can be used separately
data/deploy_docker.sh CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  docker -v
4
4
  docker login --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD
5
- docker build -t $DOCKER_HUB_USERNAME/proxes-os:latest .
6
- docker tag $DOCKER_HUB_USERNAME/proxes-os $DOCKER_HUB_USERNAME/proxes-os:$TRAVIS_TAG
7
- docker push $DOCKER_HUB_USERNAME/proxes-os:latest
8
- docker push $DOCKER_HUB_USERNAME/proxes-os:$TRAVIS_TAG
5
+ docker build -t eagerelk/proxes:latest .
6
+ docker tag eagerelk/proxes eagerelk/proxes:$TRAVIS_TAG
7
+ docker push eagerelk/proxes:latest
8
+ docker push eagerelk/proxes:$TRAVIS_TAG
data/docker-compose.yml ADDED
@@ -0,0 +1,17 @@
1
+ version: '3'
2
+ services:
3
+ web:
4
+ build: .
5
+ command: web-proxes
6
+ ports:
7
+ - '9292:9292'
8
+ environment:
9
+ - DATABASE_URL=postgres://postgres:@db/postgres
10
+ - ELASTICSEARCH_URL=http://es:9200
11
+ depends_on:
12
+ - db
13
+ - es
14
+ db:
15
+ image: postgres
16
+ es:
17
+ image: elasticsearch
data/lib/proxes/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ProxES
4
- VERSION = '0.9.1'.freeze
4
+ VERSION = '0.9.2'.freeze
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: proxes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.9.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jurgens du Toit
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-02-03 00:00:00.000000000 Z
11
+ date: 2018-02-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -448,6 +448,7 @@ files:
448
448
  - config/logger.yml
449
449
  - config/puma.rb
450
450
  - deploy_docker.sh
451
+ - docker-compose.yml
451
452
  - gulpfile.js
452
453
  - lib/ditty/components/proxes.rb
453
454
  - lib/proxes.rb
@@ -524,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
524
525
  version: '0'
525
526
  requirements: []
526
527
  rubyforge_project:
527
- rubygems_version: 2.7.4
528
+ rubygems_version: 2.7.5
528
529
  signing_key:
529
530
  specification_version: 4
530
531
  summary: Rack wrapper around Elasticsearch to provide security and management features