usmu 1.4.4-java → 1.4.5-java

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +15 -0
  3. data/LICENSE.md +1 -1
  4. data/README.md +1 -1
  5. data/circle.yml +0 -4
  6. data/lib/usmu/plugin/core.rb +4 -2
  7. data/lib/usmu/version.rb +1 -1
  8. data/spec/usmu/plugin/core_spec.rb +11 -0
  9. data/usmu.gemspec +1 -1
  10. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f9dc9e766de53f66d0f7b791f1f11f067c125d01
4
- data.tar.gz: 81de219aa3ac8c671606ebfe9b11d7e16707929f
3
+ metadata.gz: 6f9b693bb96f596489d005f216b74b220daf4282
4
+ data.tar.gz: 615892bd318a3adb4c0ead677158382c7ede7e90
5
5
  SHA512:
6
- metadata.gz: 10fa1067e7fc670cfc870e409e5bd1bc8a4cf46f628831374d0b062f2e04699bbf754ebae4f1f0d4316dbe0dbcf9ff169a038f7ada165c5ff312239a86a2d3ef
7
- data.tar.gz: 930086e119f6887041a56d4d05b3438be05f7ea341be22dd38bd512d97e2c357124f37d3ae506113ad51274dc1dbf1056323a136b82d54406f0889d6d8ed5ae6
6
+ metadata.gz: 35cb3946a721b3ffb23c7f578aa7d5282f9fa0188b353f1408cb34a72b3c5fa0b0b4921e92c7a407f311059f24e70c2a04a2ce8bb905d223aeff3fa68071a559
7
+ data.tar.gz: f28b325824d08395859092ae3689d5442f4f591f43a8df6490e4a915c0ca3ac7458536728c61699075ef459659b07e5f0acc897f356c4f96f4c1f52d2f3f6353
data/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # Usmu Change Log
2
2
 
3
+ ## 1.4.5
4
+
5
+ Matthew Scharley <matt.scharley@gmail.com>
6
+
7
+ * Bump copyright (90975f61e3b1814a13dce39f0ae8e3889ea9fa9a)
8
+ * Allow for PORT env var to override port specified in config (36956be9bcfc02489c907daa5ecbfe8ec347e095)
9
+
10
+ ## 1.4.4
11
+
12
+ Matthew Scharley <matt.scharley@gmail.com>
13
+
14
+ * Bump to >= Ruby 2.2 (1a386c38aeb329c00bc9fff90d1f3ddc756d1770)
15
+ * Fix bug in #provider_name (e90dbda1ad0902ed1d717b22ef5c1f65b1500a48)
16
+ * Bump build status to use Circle CI's badge (4aecfef22be391ec5c9acc8c69cdf8cdc7a9da9b)
17
+
3
18
  ## 1.4.3
4
19
 
5
20
  Matthew Scharley <matt.scharley@gmail.com>
data/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2014 Matthew Scharley and contributors
1
+ Copyright (c) 2016 Matthew Scharley and contributors
2
2
 
3
3
  MIT License
4
4
 
data/README.md CHANGED
@@ -8,7 +8,7 @@
8
8
  **Author:** Matthew Scharley
9
9
  **Contributors:** [See contributors on GitHub][gh-contrib]
10
10
  **Bugs/Support:** [Github Issues][gh-issues]
11
- **Copyright:** 2014
11
+ **Copyright:** 2016
12
12
  **License:** [MIT license][license]
13
13
  **Status:** Active
14
14
 
data/circle.yml CHANGED
@@ -1,7 +1,3 @@
1
- machine:
2
- ruby:
3
- version: 2.3.0
4
-
5
1
  test:
6
2
  override:
7
3
  - bundle exec rspec --format RspecJunitFormatter -o $CIRCLE_TEST_REPORTS/rspec/junit.xml
data/lib/usmu/plugin/core.rb CHANGED
@@ -82,9 +82,11 @@ module Usmu
82
82
  Rack::Handler::WEBrick.shutdown
83
83
  server.shutdown
84
84
  end
85
+ host = configuration['serve', 'host', default: 'localhost']
86
+ port = (ENV['PORT'] || configuration['serve', 'port', default: 8080]).to_i
85
87
  Rack::Handler::WEBrick.run server,
86
- Host: configuration['serve', 'host', default: 'localhost'],
87
- Port: configuration['serve', 'port', default: 8080]
88
+ Host: host,
89
+ Port: port
88
90
  @log.info('Stopped webserver.')
89
91
  end
90
92
 
data/lib/usmu/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
2
  module Usmu
3
3
  # The current version string for the gem
4
- VERSION = '1.4.4'
4
+ VERSION = '1.4.5'
5
5
  end
data/spec/usmu/plugin/core_spec.rb CHANGED
@@ -113,6 +113,17 @@ RSpec.describe Usmu::Plugin::Core do
113
113
  expect(Rack::Handler::WEBrick).to receive(:run).with(rs, Host: '0.0.0.0', Port: 8008)
114
114
  plugin.command_serve [], options
115
115
  end
116
+
117
+ it 'should take port from the environment if available' do
118
+ ENV['PORT'] = '80'
119
+ plugin.send :ui=, OpenStruct.new(configuration: configuration)
120
+ expect(Rack::Handler::WEBrick).to receive(:run).with(rs, Host: '0.0.0.0', Port: 80)
121
+ plugin.command_serve [], options
122
+ end
123
+
124
+ after(:each) do
125
+ ENV.delete 'PORT'
126
+ end
116
127
  end
117
128
 
118
129
  context '#init_copy_file' do
data/usmu.gemspec CHANGED
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
32
32
  spec.add_dependency 'json', '~> 1.8'
33
33
 
34
34
  spec.add_development_dependency 'bundler', '~> 1.6'
35
- spec.add_development_dependency 'rake', '~> 10.0'
35
+ spec.add_development_dependency 'rake', '~> 11.0'
36
36
  spec.add_development_dependency 'rspec', '~> 3.1'
37
37
  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.2'
38
38
  spec.add_development_dependency 'yard', '~> 0.8'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: usmu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.4
4
+ version: 1.4.5
5
5
  platform: java
6
6
  authors:
7
7
  - Matthew Scharley
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-25 00:00:00.000000000 Z
11
+ date: 2016-05-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: slim
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '10.0'
131
+ version: '11.0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: '10.0'
138
+ version: '11.0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rspec
141
141
  requirement: !ruby/object:Gem::Requirement