conflux 1.0.5 → 1.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: add8958d49961a77667aaf70b28b6d618138d68f
4
- data.tar.gz: 4bf4901128506923b3b415c6a7498ab76a7a1174
3
+ metadata.gz: e03d756e072cfe45e4a6a7eee51c388375eacf63
4
+ data.tar.gz: 362f57ec6435c08126aca6b6bca796f1c3be59db
5
5
  SHA512:
6
- metadata.gz: 1b75f705e3afb691f9bb617db3b0372d281662862f2d431a12689b58fed715be224364bfd13465e4774afab2835895fb663304e0a1c619a2a8cedb09552d9955
7
- data.tar.gz: 7e3fa7d615b131c91a97c10988e65b7f48abe9ca6b35da52e78a3e6f5af222c6f4c64c8bf875d58db1d4b42797907da87a6ab6ff26ad906675292cc24283c9d3
6
+ metadata.gz: 1c808b315985e33d906d9f786e5b65b26178f5fedc481b73aa42b19260c22cb5a648489b7fbcea6cb2eb351d22e5560497d449d311fe97726a5fed809c2efdf0
7
+ data.tar.gz: 8a244468a26427ba10529238df9f486bd97e74134e83b050516271b456f540d9693dcdaf49cc7c67a119e04783b7bb451acce31d7b4504798184ea568d17b50a
data/README.md CHANGED
@@ -1,22 +1,33 @@
1
1
  # Conflux Ruby gem
2
2
 
3
+ The Conflux Ruby gem is meant to be used in tandem with the [Conflux CLI](https://github.com/GoConflux/conflux-cli) to fetch your app's Conflux configs on boot of your Rails server by tying into a Railtie.
4
+
5
+ That Railtie can be found inside `lib/conflux/railtie.rb`
6
+
3
7
  ## Installation
4
8
 
9
+ **Note: If you've installed the Conflux CLI, it should have automatically installed the Conflux Ruby gem for you.**
10
+
11
+ If you need to install in manually for whatever reason, do one of the following:
12
+
5
13
  Add this line to your application's Gemfile:
6
14
 
7
15
  ```ruby
8
16
  gem 'conflux'
9
17
  ```
10
18
 
11
- And then execute:
19
+ And then install it with bundler:
12
20
 
13
21
  $ bundle install
14
22
 
15
- Or install it yourself with:
23
+ Or just use gem install:
16
24
 
17
25
  $ gem install conflux
18
26
 
27
+ ## Contributing
28
+
29
+ To contribute to this repo, submit a pull request or raise an issue in the issues section with an appropriate issue tag.
30
+
19
31
  ## License
20
32
 
21
33
  [MIT License](http://opensource.org/licenses/MIT).
22
-
@@ -87,7 +87,7 @@ module Conflux
87
87
 
88
88
  def prompt_user_to_select_app(apps_map)
89
89
  answer = nil
90
- question = "\nWhich Conflux app does this project belong to?\n"
90
+ question = "\nWhich Conflux bundle do you wish to use for this project?\n"
91
91
 
92
92
  # Keep asking until the user responds with one of the possible answers
93
93
  until !answer.nil?
@@ -1,3 +1,3 @@
1
1
  module Conflux
2
- VERSION = '1.0.5'
2
+ VERSION = '1.0.6'
3
3
  end
@@ -5,8 +5,8 @@ require 'conflux/helpers'
5
5
 
6
6
  namespace :conflux do
7
7
 
8
- desc 'Set which conflux app to use for the current directory'
9
- task :set_app do
8
+ desc 'Set which conflux bundle to use for the current directory'
9
+ task :use_bundle do
10
10
  helpers = Conflux::Helpers
11
11
  creds = helpers.ask_for_basic_creds
12
12
 
@@ -26,7 +26,7 @@ namespace :conflux do
26
26
  '/apps/manifest',
27
27
  { app_slug: app_slug },
28
28
  { 'Conflux-User' => auth_response_body['token'] },
29
- 'Connecting to Conflux app failed.'
29
+ 'Connecting to Conflux bundle failed.'
30
30
  )
31
31
 
32
32
  manifest_json = manifest_response_body['manifest']
@@ -41,7 +41,7 @@ namespace :conflux do
41
41
  f.write(JSON.pretty_generate(manifest_json))
42
42
  end
43
43
 
44
- puts "Successfully connected project to conflux app: #{app_slug}"
44
+ puts "Successfully connected project to conflux bundle: #{app_slug}"
45
45
  puts "The 'conflux' ruby gem wasn't automatically installed...Make sure it's installed if it's not already."
46
46
  end
47
47
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conflux
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 1.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Whittle
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-07-10 00:00:00.000000000 Z
11
+ date: 2016-07-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails