six-updater-web 0.12.7 → 0.13.1

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.12.7'
+  s.version = '0.13.1'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/common.rb

@@ -1,6 +1,6 @@
+require 'fileutils'
+
 module SixUpdaterWeb
-  DEFAULT_PORT = 16333
-  DEFAULT_IP = '127.0.0.1'
   OLDLOCATION = if defined?(TAR2RUBYSCRIPT)
 		oldlocation
 	else
@@ -12,7 +12,6 @@ module SixUpdaterWeb
   end
 
   SPECIAL = true
-
   SIX_ADMIN = true
 end
 
@@ -47,3 +46,5 @@ rescue
 end
 
 ENV["RAILS_ENV"] = "production"
+
+require 'config/six-updater-web'

data/lib/config/environment.rb

@@ -8,6 +8,24 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 require 'config/six-updater-web'
 
+if defined?(SixUpdaterWeb::OLDLOCATION)
+  module Rails
+    class Configuration
+      def database_configuration
+        conf = File.open(database_configuration_file, 'r') {|file| YAML::load(file)}
+        conf.each do |k, v|
+          if v["adapter"] =~ /^sqlite/
+            v["database"] = File.join(SixUpdaterWeb::DATA_PATH, v["database"]) if v.include?("database")
+            v["dbfile"]   = File.join(SixUpdaterWeb::DATA_PATH, v["dbfile"]) if v.include?("dbfile")
+          end
+        end
+        conf
+      end
+    end
+  end
+end
+
+
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers

data/lib/config/six-updater-web.rb

@@ -19,7 +19,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.12.7"
+  VERSION = "0.13.1"
 
   COMPONENT = "six-updater-web"
   SIX_PORT = 3000 unless defined?(SIX_PORT)
@@ -131,7 +131,13 @@ module SixUpdaterWeb
     df = File.join(DATA_PATH, "db")
     FileUtils.mkdir_p(df) unless File.directory?(df)
     db = File.join(DATA_PATH, "db", "production.sqlite3")
-    FileUtils.cp(File.join(BASE_PATH, "db", "production.sqlite3"), db) unless File.exists?(db)
+
+    unless File.exists?(db)
+      puts "Database Missing, creating and loading default schema and system data..."
+      File.open(db, 'w') {|f| }
+      system "ruby -rubygems \"_rake.rb\" db:schema:load sync:system"
+      #FileUtils.cp(File.join(BASE_PATH, "db", "production.sqlite3"), db)
+    end
   end
 
   def print_info
@@ -203,24 +209,3 @@ module SixUpdaterWeb
     end
   end
 end
-
-SixUpdaterWeb.print_info
-
-if defined?(SixUpdaterWeb::OLDLOCATION)
-  SixUpdaterWeb.prepare_data_path
-
-  module Rails
-    class Configuration
-      def database_configuration
-        conf = File.open(database_configuration_file, 'r') {|file| YAML::load(file)}
-        conf.each do |k, v|
-          if v["adapter"] =~ /^sqlite/
-            v["database"] = File.join(SixUpdaterWeb::DATA_PATH, v["database"]) if v.include?("database")
-            v["dbfile"]   = File.join(SixUpdaterWeb::DATA_PATH, v["dbfile"]) if v.include?("dbfile")
-          end
-        end
-        conf
-      end
-    end
-  end
-end

data/lib/init.rb

@@ -1,33 +1,42 @@
 # $stdout, $stderr = # File or String in Memory (any cleanup measures?)
 #require 'RubyGems'
 
-puts "Starting the web client... please be patient..."
-puts "This window needs to remain running during GUI operations"
-puts ""
-
-require 'common'
-
 module SixUpdaterWeb
+  DEFAULT_PORT = 16333
+  DEFAULT_IP = '127.0.0.1'
+
   OPEN_BROWSER = true
   SIX_PORT = if ARGV.to_s[/--port=([0-9]*)|-p/]
-      $1
+    $1
   else
-      ARGV << "--port=#{DEFAULT_PORT}"
-      DEFAULT_PORT
+    ARGV << "--port=#{DEFAULT_PORT}"
+    DEFAULT_PORT
   end
 
   unless ARGV.to_s[/--binding=|-b/]
-      ARGV << "--binding=#{DEFAULT_IP}"
+    # TODO: SIX_HOST?
+    ARGV << "--binding=#{DEFAULT_IP}"
   end
 end
 
-puts "Checking for required Database migrations..."
+require 'common'
 
+puts ""
+SixUpdaterWeb.print_info
+puts "This window needs to remain running during GUI operations"
+puts ""
+
+#if defined?(SixUpdaterWeb::OLDLOCATION)
+SixUpdaterWeb.prepare_data_path
+#end
+
+puts "Checking for required Database migrations..."
 Dir.chdir(File.dirname(__FILE__)) do
   system "ruby -rubygems \"_rake.rb\" db:migrate" #  goldberg:migrate
 end
 
 puts ""
+puts "Starting the web client..."
 
 # Kick off Rails
 load 'script/server'	

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 12
-  - 7
-  version: 0.12.7
+  - 13
+  - 1
+  version: 0.13.1
 platform: ruby
 authors: 
 - Sickboy