albacore 2.0.0.rc.20 → 2.0.0.rc.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ab62cb5122970f416017ee8d59b6b8734a25185
-  data.tar.gz: cef3457b0ca2e9078330eb175c43d7ae050871a9
+  metadata.gz: e10a52e5c2b0ac97eb26932080f3c411c45f0c05
+  data.tar.gz: cccdff1161c1a5f5d1edef5cee69d70fd5469b81
 SHA512:
-  metadata.gz: a05a96f5d60891dadf48527f911873f88fdef424a57af114987b21c138b66801226c7d96bcd453fbb95e545f5b17c8bf27921ea5b427d6b56f8abeeaa20a8f68
-  data.tar.gz: bcd210ec2e9343324eb148facaf0797b97a78691780283a45b7ab15bc01595279032a3a998dcb33287a49713786b23272b5c2837cdb19c5ee34520fb86da4ca3
+  metadata.gz: df6373dac8389c187d9f65e10fa81c382beb85aa51a30b8655fccee46f641effe165e03cf81369ea0c137536b7f3eebdbe9c8c0a408c0f4a0154a59cb6575a3a
+  data.tar.gz: 0a2d1f9a473052cba4a2a89b13d88b90f65a3646f2ecf742f365a1a6f9d532efcf332dd0c8c631ec57a1dd05c30e5211141fdfe468650dbd611e7c83a224df46

data/lib/albacore/app_spec.rb

@@ -42,13 +42,6 @@ module Albacore
       conf['exe'] || "#{proj.asmname}.exe"
     end
 
-    # Gets the location fully qualified path that the finished artefact will be
-    # installed into. Defaults to C:\\Services\\{id}.
-    #
-    def deploy_dir
-      conf['deploy_dir'] || "C:\\Services\\#{id}"
-    end
-
     # Resolves the project file given an optional descriptor path or a
     # configuration hash or both. One of the other of the parameters need to
     # exist, or an error will be thrown.
@@ -164,6 +157,19 @@ module Albacore
       conf['provider'] || 'defaults'
     end
 
+    # Gets the configured port to bind the site to
+    #
+    def port
+      conf['port'] || '80'
+    end
+
+    # Gets the host header to use for the binding in IIS - defaults to *, i.e.
+    # binding to all hosts
+    #
+    def host_header
+      conf['host_header'] || '*'
+    end
+
     # TODO: support a few of these:
     # https://github.com/bernd/fpm-cookery/wiki/Recipe-Specification
 

data/lib/albacore/app_spec/defaults.rb

@@ -38,6 +38,13 @@ module Albacore
       end
     end
 
+    # Gets the location fully qualified path that the finished artefact will be
+    # installed into. Defaults to C:\\Services\\{id}.
+    #
+    def deploy_dir app_spec
+      app_spec.conf['deploy_dir'] || "C:\\Services\\#{app_spec.id}"
+    end
+
     # Get the relative resource from 'albacore/app_spec/.' as a string.
     def embedded_resource relative_path
       File.open(embedded_resource_path(relative_path), 'r') { |io| io.read }
@@ -53,7 +60,7 @@ module Albacore
 
       io.write %{
 Install-Service `
-  -ServiceExeName "#{app_spec.exe}" -ServiceDir "#{app_spec.deploy_dir}" `
+  -ServiceExeName "#{app_spec.exe}" -ServiceDir "#{deploy_dir app_spec}" `
   -CurrentPath (Split-Path $MyInvocation.MyCommand.Path)
 }
     end

data/lib/albacore/app_spec/iis_site.rb

@@ -15,17 +15,20 @@ module Albacore
 
     # location/folder inside nuget to place everything found in the
     # #source_dir inside
+    #
     def nuget_contents
       'contents'
     end
 
     # where to copy from - will copy ALL contents of this directory - in this
     # case will copy from the directory that the appspec is in.
+    #
     def source_dir app_spec, configuration = 'Release'
       "#{File.dirname(app_spec.path)}/."
     end
 
     # Extends the outputted data with the installation routines
+    #
     def write_invocation app_spec, io
       debug { 'writing iis site installation invocation [app_spec/iis_site#write_invocation]' }
 
@@ -35,8 +38,17 @@ module Albacore
 
 # deliberately lowercase id/name/title.
 Install-Site -SiteName '#{app_spec.title}' `
-    -WebSiteRootFolder '#{normalise_slashes(File.expand_path('..', app_spec.deploy_dir))}'
+    -Port #{app_spec.port} `
+    -HostHeader '#{app_spec.host_header}' `
+    -WebSiteRootFolder '#{normalise_slashes(deploy_dir(app_spec))}'
 }
     end
+
+    # Overrides the default deploy dir with a folder that is NOT services,
+    # unless the property is set in the .appspec file.
+    #
+    def deploy_dir app_spec
+      app_spec.conf['deploy_dir'] || "C:\\WebSites"
+    end
   end
 end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.20"
+  VERSION = "2.0.0.rc.21"
 end

data/resources/installSite.ps1

@@ -4,13 +4,16 @@ Function Install-Site(
     # Folder where all your websites are located
     [string] $WebSiteRootFolder = "C:\WebSites",
 
-    # The port your default binding is using
-    [int] $Port = 80,
-
     # Where the source files are -- without any trailing slash or otherwise --
     # just the name, please.
     [string] $SourceDirectory = "contents",
 
+    # What domain name the site should bind to
+    [string] $HostHeader,
+
+    # The port your default binding is using
+    [int] $Port,
+
     # Name of site that you're setting up
     [string] $SiteName
 ) {
@@ -41,10 +44,8 @@ Function Install-Site(
         # Create application pool
         New-WebAppPool -Name $siteAppPool -Force
 
-        $hostHeader = Invoke-Expression "facter fqdn"
-
         # Create site
-        New-Website -Name $SiteName -Port $Port -HostHeader $hostHeader `
+        New-Website -Name $SiteName -Port $Port -HostHeader $HostHeader `
             -ApplicationPool $siteAppPool -PhysicalPath $siteInstallLocation
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.20
+  version: 2.0.0.rc.21
 platform: ruby
 authors:
 - Henrik Feldt