netfira-installer-generator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8eefc83aaedbcac1b2d739260c6fe1640f0102
-  data.tar.gz: 2e9faee4cff0689bd39c9f2530aeda3eb47df43a
+  metadata.gz: b848e1504048dd2b24afcbf14149d592f82c9d01
+  data.tar.gz: 3684965c03d87636e97f8536533c2cd80424c8b9
 SHA512:
-  metadata.gz: ce181f471ec525eb3cec3801953c87e7ee444e1c9b638fbe924cab6d13563c818487e54a4268273dc493d4d899a5b525d03bdc6b189cc0eb67006d54b32108af
-  data.tar.gz: bc495314f068e423cbe3243f527c18330b494e937cb56f9fd9ec77bc54eaf9cac573280035a74c0c7ad2ec318441476c6c421e3ccac802d30635b12ce58ee757
+  metadata.gz: c9e7fdcc381123d45e290fa6595252fdb5edad42e821fb1d3563352342ee89f1278a84fe1cc5a3fd2b0c716ea57ef0ac996c6fe09d55f5be78036b1cfacb71cf
+  data.tar.gz: e9557a893d99aefce915a2524f962cbdc989a610e5909d2865507295d9d35eebc70644ba9fb734d7cb83ca9124b634dbf505c3b73879ed88a457169848e53608

data/lib/netfira/installer_generator.rb

@@ -103,16 +103,16 @@ module Netfira
     end
 
     def render_nsis_template
-      # noinspection RubyStringKeysInHashInspection
+      # noinspection RubyStringKeysInHashInspection,SpellCheckingInspection
       values = {
           'INSTALLER_NAME' => installer_name,
           'TEMP_DIR' => temp_dir,
           'INSTALLER_FILENAME' => installer_filename,
-          'WHO_AM_I_GUID' => shop_id,
-          'AUTHENTICATION_SERVER_1' => auth_server,
+          'SHOP_ID' => shop_id,
+          'AUTHENTICATION_SERVER' => auth_server,
           'WEBSTORE_SYNC_URL' => sync_url,
           'WEBSTORE_FRONT_URL' => shop_url,
-          'SHOP_ADDRESS' => URI.parse(shop_url).host,
+          'SHOP_ADDRESS' => URI.parse(sync_url).host,
           'NO_USE_SSL' => use_ssl ? '0' : '1'
       }
       NsisTemplate.sub values

data/lib/netfira/installer_generator/nsis_template.rb

@@ -1,4 +1,5 @@
 module Netfira
+  # noinspection SpellCheckingInspection
   class InstallerGenerator
     module NsisTemplate
 
@@ -10,62 +11,27 @@ module Netfira
 
       def self.template
         @template ||= <<-__EOF__
-; This script creates the bootstrap installer for the Netfira download manager.
 
-;--------------------------------
-; No output from this bootstrap installer:
 SilentInstall silent
+Name          "{INSTALLER_NAME}"
+Icon          setup.ico
+OutFile       nsis_generated.exe
+InstallDir    "$TEMP\\{TEMP_DIR}"
 
-; The name of the installer
-Name "{INSTALLER_NAME}"
-Icon setup.ico
-
-; The file to write
-OutFile "nsis_generated.exe"
-
-; The default installation directory
-InstallDir $TEMP\{TEMP_DIR}
-
-; The stuff to install
 Section ""
-
-  ; Set output path to the installation directory.
   SetOutPath $INSTDIR
-
-  ; Put file Netfira download manager in the temp directory
   File {INSTALLER_FILENAME}
 
-  ; WhoAmIGUID
-  ReadRegStr $1 HKLM "Software\Netfire\AMIPS" "WhoAmIGUID"
-
-  ; if the registry value is empty - set it, otherwise continue
-  StrCmp $1 "" 0 +2
-    WriteRegStr HKLM "Software\Netfire\AMIPS" "WhoAmIGUID" "{WHO_AM_I_GUID}"
-
-  ; AuthenticationServer1
-  ReadRegStr $1 HKLM "Software\Netfire\AMIPS" "AuthenticationServer1"
-
-  ; if the registry value is empty - set it, otherwise continue
-  StrCmp $1 "" 0 +2
-  	WriteRegStr HKLM "Software\Netfire\AMIPS" "AuthenticationServer1" "{AUTHENTICATION_SERVER_1}"
-
-  ; Webstore
-  ReadRegStr $1 HKLM "Software\Netfire\Webstore" "SyncURL"
-
-  ; if the registry value is empty - set it, otherwise continue
-  StrCmp $1 "" 0 +2
-  	WriteRegStr HKLM "Software\Netfire\Webstore" "SyncURL" "{WEBSTORE_SYNC_URL}"
-  StrCmp $1 "" 0 +2
-  	WriteRegStr HKLM "Software\Netfire\Webstore" "StoreFrontURL" "{WEBSTORE_FRONT_URL}"
-  StrCmp $1 "" 0 +2
-    WriteRegStr HKLM "Software\Netfire\Webstore" "Server" "{SHOP_ADDRESS}"
-  StrCmp $1 "" 0 +2
-    WriteRegStr HKLM "Software\Netfire\Networking" "NoUseSsl" "{NO_USE_SSL}"
-
-  ; Execute the download manager:
-  Exec '"$INSTDIR\{INSTALLER_FILENAME}"'
+ 	WriteRegStr HKLM "Software\\Netfire\\AMIPS"      "AuthenticationServer1"  "{AUTHENTICATION_SERVER}"
+	WriteRegStr HKLM "Software\\Netfire\\Webstore"   "ShopId"                 "{SHOP_ID}"
+	WriteRegStr HKLM "Software\\Netfire\\Webstore"   "SyncURL"                "{WEBSTORE_SYNC_URL}"
+ 	WriteRegStr HKLM "Software\\Netfire\\Webstore"   "StoreFrontURL"          "{WEBSTORE_FRONT_URL}"
+  WriteRegStr HKLM "Software\\Netfire\\Webstore"   "Server"                 "{SHOP_ADDRESS}"
+  WriteRegStr HKLM "Software\\Netfire\\Networking" "NoUseSsl"               "{NO_USE_SSL}"
 
+  Exec '"$INSTDIR\\{INSTALLER_FILENAME}"'
 SectionEnd
+
         __EOF__
       end
 

data/lib/netfira/installer_generator/version.rb

@@ -1,5 +1,5 @@
 module Netfira
   class InstallerGenerator
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netfira-installer-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies: []
 description: Netfira Windows App Installer Generator
 email:
@@ -54,3 +54,4 @@ signing_key:
 specification_version: 4
 summary: Netfira Windows App Installer Generator
 test_files: []
+has_rdoc: