craftbelt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b100532f050384f8ba6dd827e674cfda68a489
-  data.tar.gz: e83fa30cf1026d1e945d186c3ecfae55d4b240c9
+  metadata.gz: 128b56aa947e03ee596507823f0519b1f643e6d5
+  data.tar.gz: 57c37312109f8fa2d776069cf3a4bbcf20afb8a2
 SHA512:
-  metadata.gz: 22ccdbc1dcd50aa85620363d19db985ffd2f8dcb55951f08b834e490f853c8724ca4ccec0c7f4a9f1933ea78d9b25ea55eba5bc0039d52595ded8a61c3313dff
-  data.tar.gz: d0bd24ba508ed3c72ea5db77ce266689a1d32d4ac000b525df1ef5f075e4b47a1f8cff32d6ef66599adde63f26add9cdc30bb37e44e75046d170aba3ec33ef7f
+  metadata.gz: cbdfb6c929c475fd719168150a61cbbe622f4dd4cf9629acc46e6a10ea3298d87ab1a7bc047240562d064ef67ce9029f1f6a9cc46126f319c87514e337302bc3
+  data.tar.gz: c311fccb03bf66699167d2ea4de5460291812f42274e7d180d79ae0d61baa7825c9b76015f6e0e5ad26a0b94b3ef8614dd6a2ca30f07b970f2d26d91362cfeaf

data/craftbelt.gemspec

@@ -16,7 +16,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'nbtfile'
-  gem.add_development_dependency 'rspec'
+  
+  %w(rspec fakefs).each do |dep|
+    gem.add_development_dependency dep
+  end
 
   gem.files = %w(
     Gemfile

data/lib/craftbelt.rb

@@ -1,2 +1,3 @@
-require 'craftbelt/schema'
+require 'craftbelt/env'
+require 'craftbelt/settings'
 require 'craftbelt/version'

data/lib/craftbelt/env.rb

@@ -0,0 +1,85 @@
+require 'craftbelt/instance'
+
+module Craftbelt
+  class Env
+    attr_reader :build_dir, :instance, :settings
+
+    def initialize(instance_dir, build_dir, extra_settings={})
+      @instance = Craftbelt::Instance.new(instance_dir)
+      @build_dir = build_dir
+      vals = data[:settings].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)
+      end
+    end
+
+    def schema
+      @schema ||= begin
+        JSON.parse(File.read("#{@build_dir}/funpack.json"))['schema']
+      end
+    end
+
+    def access
+      @access ||= begin
+        # TODO remove when access policies are standard
+        data[:access] || {
+          whitelist: (data['settings']['whitelist'] || '').split
+        }
+      end
+    end
+
+    def whitelist?
+      !!access[:whitelist]
+    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] || ''))
+    end
+
+    def write_templates(templates)
+      templates.each do |src, dest|
+        `mkdir -p #{File.dirname(dest)}`
+        File.write(dest, erb(File.read("#{@build_dir}/templates/#{src}")))
+      end
+    end
+
+    # TODO remove this when players are passed as an array
+    def player_list(player_setting)
+      if player_setting.is_a? Array
+        player_setting.join("\n")
+      else
+        player_setting
+      end
+    end
+
+    def ram
+      (ENV['RAM'] || 1024).to_i
+    end
+
+    def field(name)
+      settings.field(name)
+    end
+    alias_method :f, :field
+
+    def erb(template)
+      ERB.new(template).result(binding)
+    end
+
+  end
+end

data/lib/craftbelt/{minecraft_instance.rb → instance.rb}

@@ -2,7 +2,7 @@ require 'find'
 require 'nbtfile'
 
 module Craftbelt
-  class MinecraftInstance
+  class Instance
     attr_reader :root
 
     ROOT_FILES = %w(

data/lib/craftbelt/settings.rb

@@ -0,0 +1,33 @@
+require 'brock'
+
+module Craftbelt
+  class Settings
+    attr_reader :schema, :values
+
+    def initialize(definitions, values={})
+      @schema = Brock::Schema.new(definitions)
+      @values = values
+    end
+
+    def field(name)
+      field = schema.fields.find{|f| f.name.to_sym == name.to_sym }
+
+      value = values[name]
+      if value.nil? 
+        value = values[name.to_sym]
+      end
+
+      raise "Unknown field: #{name}" if field.nil? and value.nil?
+
+      if field
+        if value.nil?
+          field.default
+        else
+          field.parse_param(value)
+        end
+      else
+        value
+      end
+    end
+  end
+end

data/lib/craftbelt/version.rb

@@ -1,5 +1,5 @@
 module Craftbelt
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   def self.version
     VERSION

data/spec/craftbelt/minecraft_instance_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-require 'craftbelt/minecraft_instance'
+require 'craftbelt/instance'
+require 'fakefs'
 
 module Craftbelt
   describe MinecraftInstance do
@@ -12,6 +13,8 @@ module Craftbelt
       end
     end
 
+    before { FileUtils.mkdir_p('tmp/server')  }
+
     subject { MinecraftInstance.new('.') }
 
     context 'single player world' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: craftbelt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dave Newman
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Useful Minecraft utilities
 email:
 - dave@minefold.com
@@ -48,8 +62,9 @@ files:
 - Gemfile
 - README.md
 - craftbelt.gemspec
-- lib/craftbelt/minecraft_instance.rb
-- lib/craftbelt/minecraft_settings.rb
+- lib/craftbelt/env.rb
+- lib/craftbelt/instance.rb
+- lib/craftbelt/settings.rb
 - lib/craftbelt/version.rb
 - lib/craftbelt.rb
 - spec/craftbelt/minecraft_instance_spec.rb

data/lib/craftbelt/minecraft_settings.rb

@@ -1,59 +0,0 @@
-class MinecraftSettings
-  attr_reader :build_dir, :instance, :settings
-
-  def initialize(build_dir)
-    @build_dir = build_dir
-    @instance = Craftbelt::MinecraftInstance.new('.')
-  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)
-    end
-  end
-
-  def settings
-    @settings ||= begin
-      # TODO remove when access policies are standard
-      access = data[:access] || {
-        whitelist: (data['settings']['whitelist'] || '').split
-      }
-
-      schema = JSON.parse(File.read("#{@build_dir}/funpack.json"))['schema']
-
-      Settings.new(schema, data[:settings].merge(
-          "name" => data[:name],
-          "enable-white-list" => data[:access],
-          "level-name" => (@instance.level_paths.first || 'level')
-        )
-      )
-    end
-  end
-
-  def write_player_files
-    File.write('ops.txt', player_list(data[:settings][:ops]))
-    File.write('white-list.txt', player_list(data[:settings][:whitelist]))
-    File.write('banned-players.txt', player_list(data[:settings][:blacklist]))
-  end
-
-  def write_templates(templates)
-    templates.each do |src, dest|
-      `mkdir -p #{File.dirname(dest)}`
-      File.write(dest, settings.erb(File.read("#{@build_dir}/templates/#{src}")))
-    end
-  end
-
-  # TODO remove this when players are passed as an array
-  def player_list(player_setting)
-    if player_setting.is_a? Array
-      player_setting.join("\n")
-    else
-      player_setting || ''
-    end
-  end
-end