bandshell 1.1 → 1.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4f98087fc1c8d04747df09f03de6bbc00e57ba2e
4
- data.tar.gz: b0832fa74e5106bf33e8c7144df3ec53204dda8a
3
+ metadata.gz: 3f691eea3256e1bb34482ca43c354cdb4cbd1514
4
+ data.tar.gz: 5003147ec2c51c314ef5a81f299ab4305c8610a5
5
5
  SHA512:
6
- metadata.gz: 897c2197b7a44f22579a896da40f3ceeec9ff01a3730d3799992e1781365ff14a24dc6632ec20aed29211f93bb736a6c99295fa4ea8f429b9891549aba9b3ace
7
- data.tar.gz: bf6c27fa4301422f1ba43cabc1b24604078eabb6e3b29c2b1085d1d25504bc9ea66668b073f434ce67308f689e77f4e58c65bca65fcb1cf261ff4067f5df588c
6
+ metadata.gz: a062d1067b2244260ef3420da36d560a02f80f32bea1e15531311f95f77e3d9f7542109827e652262320c11d2a755a568b5abfb200e0ef293a6e9f71dfcf6130
7
+ data.tar.gz: 57c865c44869c4f64efeb203b646969941ae176d4a1e2a67ec22dfad39405e2deefeec60d18bf6c5d5a61bb109f13ee321145bd999a8412190070aeea0ebb8c2
@@ -15,7 +15,11 @@
15
15
  </div>
16
16
 
17
17
  <div class="default-padding">
18
- <h3>We need the URL of your Concerto instance before we can get up and running.</h3>
18
+ <% if @url.empty? %>
19
+ <h3>We need the URL of your Concerto instance before we can get up and running.</h3>
20
+ <% else %>
21
+ <h3>Current Concerto Server Address: <a href="<%=@url%>"><%= @url%></a></h3>
22
+ <% end %>
19
23
  <br />
20
24
 
21
25
  <form method="post">
@@ -40,14 +44,16 @@
40
44
  <td><p>IP Address:</p></td>
41
45
  <td><p><b class="pronounced"><%= my_ip %></b></p></td>
42
46
  </tr>
43
- <tr>
44
- <td><p>Default Username:</p></td>
45
- <td><p><b class="pronounced">root</b></p></td>
46
- </tr>
47
- <tr>
48
- <td><p>Default Password:</p></td>
49
- <td><p><b class="pronounced">default</b></p></td>
50
- </tr>
47
+ <% unless Bandshell::ConfigStore.config_exists?('password')%>
48
+ <tr>
49
+ <td><p>Default Username:</p></td>
50
+ <td><p><b class="pronounced">root</b></p></td>
51
+ </tr>
52
+ <tr>
53
+ <td><p>Default Password:</p></td>
54
+ <td><p><b class="pronounced">default</b></p></td>
55
+ </tr>
56
+ <% end %>
51
57
  <tr>
52
58
  <td><p>Access this page with URL:</p></td>
53
59
  <td><p><b class="pronounced"><a href="http://<%= my_ip %>:<%= my_port %>/setup">http://<%= my_ip %>:<%= my_port %>/setup</a></b></p></td>
@@ -24,6 +24,14 @@ module Bandshell
24
24
  default
25
25
  end
26
26
  end
27
+
28
+ #check if a config exists
29
+ def self.config_exists?(name)
30
+ initialize_path if not @@path
31
+ file = File.join(@@path, name)
32
+ rofile = File.join(@@ropath, name)
33
+ File.exist?(file) || File.exist?(rofile)
34
+ end
27
35
 
28
36
  # Write a config to the read/write configuration location.
29
37
  def self.write_config(name, value)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bandshell
3
3
  version: !ruby/object:Gem::Version
4
- version: '1.1'
4
+ version: '1.2'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Concerto Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-02 00:00:00.000000000 Z
11
+ date: 2015-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sinatra
@@ -151,7 +151,8 @@ files:
151
151
  - lib/bandshell/player_info.rb
152
152
  - lib/bandshell/screen_control.rb
153
153
  homepage:
154
- licenses: []
154
+ licenses:
155
+ - Apache-2.0
155
156
  metadata: {}
156
157
  post_install_message:
157
158
  rdoc_options: []
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
169
170
  version: '0'
170
171
  requirements: []
171
172
  rubyforge_project:
172
- rubygems_version: 2.2.2
173
+ rubygems_version: 2.4.5
173
174
  signing_key:
174
175
  specification_version: 4
175
176
  summary: Concerto Client Tools