gold 0.4.1 → 0.4.2
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +5 -0
- data/lib/gold.rb +6 -3
- metadata +1 -1
data/History.txt
CHANGED
data/lib/gold.rb
CHANGED
@@ -26,7 +26,7 @@ class Gold
|
|
26
26
|
|
27
27
|
SettingsMessages = {
|
28
28
|
'1. gold_branch' => 'name of local branch that will track gold master',
|
29
|
-
'2. gold_remote' => 'name
|
29
|
+
'2. gold_remote' => 'local name for remote gold master',
|
30
30
|
'3. gold_repository' => 'remote repository',
|
31
31
|
'4. developer_name' => 'developer\'s account on remote repository',
|
32
32
|
'5. developer_email' => 'developer\'s email',
|
@@ -44,6 +44,9 @@ class Gold
|
|
44
44
|
end
|
45
45
|
|
46
46
|
def run(args)
|
47
|
+
if settings.nil? && !%w{setup settings}.include?(args[0])
|
48
|
+
return error("Please run 'gold settings' first (missing .git/gold.yml settings)\n")
|
49
|
+
end
|
47
50
|
case args[0]
|
48
51
|
when 'add_dev'
|
49
52
|
add_dev args[1], args[2]
|
@@ -190,7 +193,7 @@ gold review #{developer_name}/#{branch}
|
|
190
193
|
|
191
194
|
def create_settings_file
|
192
195
|
FileUtils::mkpath(File.dirname(settings_path)) unless File.exist?(File.dirname(settings_path))
|
193
|
-
defaults = settings
|
196
|
+
defaults = DefaultSettings.merge(settings || {})
|
194
197
|
new_settings = {}
|
195
198
|
SettingsMessages.keys.sort.each do |key|
|
196
199
|
real_key = key.gsub(/\A.*? /,'')
|
@@ -210,7 +213,7 @@ gold review #{developer_name}/#{branch}
|
|
210
213
|
if File.exist?(settings_path)
|
211
214
|
YAML::load(File.read(settings_path))
|
212
215
|
else
|
213
|
-
|
216
|
+
nil
|
214
217
|
end
|
215
218
|
end
|
216
219
|
end
|