craftbelt 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e462c739e53345fe7634ed552cf025027576dc7
-  data.tar.gz: 841bb207d6d924ec7ef798c5a9ec77008fad21e8
+  metadata.gz: e3c983785bc1eceed79f96260a3697991d71e2e8
+  data.tar.gz: 56451cd1c9b7d82054187b0e8a1abf68ae4777a3
 SHA512:
-  metadata.gz: 66c2b2a578c471cbb6cfa92f5fa0a7c2d92fb3559b48f5443704f938918c8a58ca7454a2d96882b0cd99b81f5cd7457816e0c57b8cb5cf4d2093fa92f09a2197
-  data.tar.gz: 5421e9adadbaaf8a5b2a8e8f43597a7dbe2f86ace08a365d976892e1d8b469b207558ac9b54d30b258e3be917b0e2f6507ecc44ccb94e2a9ea48086798dcc3af
+  metadata.gz: 0e8da972015cb43b7979e2d26fd776b5203346330131f655c05a79a0c98b9a0b46d0b832320b360ae8e53c4c8c3abf6c73c092858a496ca0e9b0cf7f2f15625e
+  data.tar.gz: 5cb29c79f2bdeb52fe49ec9bd4d15cf68b08330b8bce292d4b21bad9303f8d2520948c30eb7d623253f66dfd86865c66d4411736196cfb3f15ad49f13ddbc0dd

data/lib/craftbelt/env.rb

@@ -7,23 +7,18 @@ module Craftbelt
     def initialize(instance_dir, build_dir, extra_settings={})
       @instance = Craftbelt::Instance.new(instance_dir)
       @build_dir = build_dir
-      vals = data[:settings].merge(
+      vals = settings_raw.merge(
           "name" => data[:name],
           "enable-white-list" => whitelist?,
           "level-name" => (instance.level_paths.first || 'level')
         ).merge(extra_settings)
-        
+
       @settings = Settings.new(schema, vals)
     end
 
     def data
       @data ||= begin
-        data_text = ENV['DATA']
-        if !data_text
-          data_text = File.read(File.expand_path(ENV['DATAFILE']))
-        end
-
-        JSON.parse(data_text, symbolize_names: true)
+        JSON.parse(ENV['DATA'] || '{}', symbolize_names: true) rescue {}
       end
     end
 
@@ -35,10 +30,7 @@ module Craftbelt
 
     def access
       @access ||= begin
-        # TODO remove when access policies are standard
-        data[:access] || {
-          whitelist: (data[:settings][:whitelist] || '').split
-        }
+        data[:access] || { blacklist: [] }
       end
     end
 
@@ -46,10 +38,16 @@ module Craftbelt
       !!access[:whitelist]
     end
 
+    def settings_raw
+      @settings_raw ||= begin
+        data[:settings] || {}
+      end
+    end
+
     def write_player_files
-      File.write('ops.txt', player_list(data[:settings][:ops]))
-      File.write('white-list.txt', player_list(access[:whitelist] || ''))
-      File.write('banned-players.txt', player_list(access[:blacklist] || ''))
+      File.write('ops.txt', player_list(settings_raw[:ops])) if settings_raw[:ops]
+      File.write('white-list.txt', player_list(access[:whitelist])) if access[:whitelist]
+      File.write('banned-players.txt', player_list(access[:blacklist])) if access[:blacklist]
     end
 
     def write_templates(templates)

data/lib/craftbelt/version.rb

@@ -1,5 +1,5 @@
 module Craftbelt
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: craftbelt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dave Newman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nbtfile
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Test Minefold funpacks