minke-generator-netmvc 0.12.0 → 0.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWUyZWM3ZDlhMDZjY2RkZGNiZGNlYzVhNmE3MzY2MjVhZDQ5NzYzNw==
+    NGI2ZWI2NjgxNDVkMWQ1ZjNkZDg0M2M5MDQwYWJkOWQ0ZjUxNzJlMA==
   data.tar.gz: !binary |-
-    YTk1NmM4YWVjY2ZkMzI2NWNhZTJlNjE1NmNhZDY5N2VkMWRhMTkwOA==
+    YTEzOTdkYWE0NzJjNDA0MTIxNmMyMTI4YmQxMTVmM2ZhMjFhZjdhMA==
 SHA512:
   metadata.gz: !binary |-
-    NjllMGQwOThkYjEzZDFkYmRmODE4NWFkNDAxODBkZjIyOTg0MDZiMGQ0YzZh
-    ZTNhMmJhZDE0MGFlM2JlMDA5ZDY5Y2I5YzUwNmRhMzZlMzM1OWEwYmEzYjNh
-    MWVkYzRlMzBlYmJjNmE5NWEzNmM5ZGE5M2YxODEwMWUyZWFjMWY=
+    OWIyMjZmNjE2ZWUwOTkyNzYwNDVmYTI1ZGRlMjA1OTI3MDhjZGVkNGFmYTgy
+    MGQ1MmI0MTU4NGEwNTUyMDlhOTYyY2E4ZWUwNTM1YWJkN2EwODE5MTcyYjk2
+    ZjU5M2I0YjQ2ZDliYThjYjhkMTgwNTMyMGI5MGU2Y2ZmYTFlMWU=
   data.tar.gz: !binary |-
-    ZDk5YTlmZjkwYjQzZjM0NjIxZTM0NTlmNTVhNTFiYTJmMTk0NDFkMmMyZmU3
-    NThjYTM0MTAzMWYzZjkxNDlkNGI2YmI5MTI2ZjYxMTc3N2FhZWE2NjIzOGNl
-    YmMzZGViNWQzYjVmNjFmMDJlNGJmMTBkMzFhZDkwYmMyOWY3NWU=
+    YjJlYjMwMjYyODY0MzE4NDlhNmQ4Y2JhYTdkZWZmYjJjYjIyNTkwNmEyMDI1
+    ZmQzZTU4ODRmMDJmOWI3Y2JjMDg3OWVkNWZjZDM3OTk0ZjBiZmQ4YzRlZWU4
+    MDVlNGVmMmJiNGQ5MWQyNzlkNGRjZjVjMTlmZGE4MmZhNTlhMTM=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minke-generator-netmvc (0.10.0)
+    minke-generator-netmvc (0.12.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/generators/netmvc/scaffold/.gitignore.erb

@@ -1,11 +1,17 @@
-/<%= application_name %>
-/bin
-/obj
-.DS_Store
+# Application binaries
+/src/<%= application_name %>/bin
+/src/<%= application_name %>/obj
+/test/<%= application_name %>.Tests/bin
+/test/<%= application_name %>.Tests/obj
 /.nuget
+
+# Application build assets
 /_build/dockerfile/<%= application_name %>/bin
 /_build/dockerfile/<%= application_name %>/swagger_spec
 /_build/dockerfile/<%= application_name %>/swagger_spec
 /_build/dockerfile/<%= application_name %>/project.json
 /_build/dockerfile/<%= application_name %>/project.lock.json
 /_build/dockerfile/<%= application_name %>/web.config
+
+# Pesky mac files
+.DS_Store

data/lib/generators/netmvc/scaffold/.vscode/launch.json.erb

@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/<%= application_name %>.dll",
+            "program": "${workspaceRoot}/src/<%= application_name %>/bin/Debug/netcoreapp1.0/<%= application_name %>.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false
@@ -16,7 +16,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/<%= application_name %>.dll",
+            "program": "${workspaceRoot}/src/<%= application_name %>/bin/Debug/netcoreapp1.0/<%= application_name %>.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,

data/lib/generators/netmvc/scaffold/.vscode/{tasks.json → tasks.json.erb}

@@ -8,10 +8,16 @@
     "tasks": [
         {
             "taskName": "build",
-            "args": [ ],
+            "args": ["./src/<%= application_name %>"],
             "isBuildCommand": true,
             "showOutput": "silent",
             "problemMatcher": "$msCompile"
+        },
+        {
+          "taskName": "test",
+          "args": ["./test/<%= application_name %>.Tests"],
+          "isBuildCommand": false,
+          "problemMatcher": "$msCompile"
         }
     ]
-}
+}

data/lib/generators/netmvc/scaffold/_build/config.yml.erb

@@ -13,17 +13,19 @@ docker:
   application_compose_file: './dockercompose/<%= application_name %>/docker-compose.yml'
 fetch:
   enabled: true
+test:
+  enabled: true
 build:
   post:
     copy:
       -
-        from: '../bin'
+        from: '../src/<%= application_name %>/bin'
         to: './dockerfile/<%= application_name %>'
       -
-        from: '../project.json'
+        from: '../src/<%= application_name %>/project.json'
         to: './dockerfile/<%= application_name %>'
       -
-        from: '../web.config'
+        from: '../src/<%= application_name %>/web.config'
         to: './dockerfile/<%= application_name %>'
       -
         from: './swagger_spec/swagger.yml'

data/lib/generators/netmvc/scaffold/global.json

@@ -0,0 +1,6 @@
+{
+  "projects": [ "src", "test" ],
+  "sdk": {
+    "version": "1.0.0-rc2-*"
+  }
+}

data/lib/generators/netmvc/scaffold/{project.json.erb → src/<%= application_name %>/project.json.erb }

@@ -1,4 +1,6 @@
 {
+  "description": "<%= application_name %> iPad api on ASP.NET MVC 6",
+  "version": "1.0.0",
   "dependencies": {
     "Microsoft.NETCore.App": {
       "version": "1.0.0-rc2-3002702",

data/lib/generators/netmvc/scaffold/test/<%= application_name %>.Tests/Controllers/HealthControllerTest.cs.erb

@@ -0,0 +1,15 @@
+using <%= namespace %>.Controllers;
+using Xunit;
+
+namespace TestNamespace.Controllers
+{
+    public class TestHealthController
+  {
+    [Fact]
+    public void ThisWillPass()
+    {
+      var controller = new HealthController();
+      Assert.True(true);
+    }
+  }
+}

data/lib/generators/netmvc/scaffold/test/<%= application_name %>.Tests/project.json.erb

@@ -0,0 +1,29 @@
+{
+  "name": "<%= application_name %>.test",
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "warningsAsErrors": true
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [ "dnxcore50", "portable-net45+win8" ],
+      "dependencies": {
+        "xunit": "2.1.0",
+        "dotnet-test-xunit": "1.0.0-rc2-build10015"
+      }
+    }
+  },
+  "dependencies": {
+    "<%= application_name %>": "1.*"
+  },
+  "testRunner": "xunit",
+  "runtimes": {
+    "ubuntu.14.04-x64": { },
+    "centos.7.1-x64": { },
+    "debian.8-x64": { },
+    "win7-x64": { },
+    "win81-x64": { },
+    "win10-x64": { },
+    "osx.10.11-x64": { }
+  }
+}

data/lib/generators/netmvc/version.rb

@@ -1,7 +1,7 @@
 module Minke
   module Generators
     module NetMVC
-      VERSION = "0.12.0"
+      VERSION = "0.13.0"
     end
   end
 end

data/lib/generators/netmvc.rb

@@ -14,9 +14,9 @@ module Minke
       config.build_settings = Minke::Generators::BuildSettings.new
 
       config.build_settings.build_commands = Minke::Generators::BuildCommands.new.tap do |bc|
-        bc.fetch = [['/bin/bash', '-c', 'dotnet restore --packages .nuget']]
-        bc.test = [['/bin/bash', '-c', 'NUGET_PACKAGES=.nuget dotnet test']]
-        bc.build = [['/bin/bash', '-c', 'rm -rf bin && rm -rf obj && NUGET_PACKAGES=.nuget dotnet build -c Release']]
+        bc.fetch = [['/bin/bash', '-c', 'dotnet restore --packages /<%= application_name %>/.nuget ./test/<%= application_name %>.Tests && dotnet restore --packages /<%= application_name %>/.nuget ./src/<%= application_name %>']]
+        bc.test = [['/bin/bash', '-c', 'NUGET_PACKAGES=/<%= application_name %>/.nuget dotnet test ./test/<%= application_name %>.Tests']]
+        bc.build = [['/bin/bash', '-c', 'rm -rf ./src/<%= application_name %>/bin && rm -rf ./src/<%= application_name %>/obj && NUGET_PACKAGES=/<%= application_name %>/.nuget dotnet build ./src/<%= application_name %> -c Release']]
       end
 
       config.build_settings.docker_settings = Minke::Generators::DockerSettings.new.tap do |bs|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke-generator-netmvc
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,12 +75,8 @@ files:
 - lib/generators/netmvc.rb
 - lib/generators/netmvc/scaffold/.gitignore.erb
 - lib/generators/netmvc/scaffold/.vscode/launch.json.erb
-- lib/generators/netmvc/scaffold/.vscode/tasks.json
-- lib/generators/netmvc/scaffold/Controllers/HealthController.cs.erb
-- lib/generators/netmvc/scaffold/Program.cs.erb
-- lib/generators/netmvc/scaffold/Properties/launchSettings.json
+- lib/generators/netmvc/scaffold/.vscode/tasks.json.erb
 - lib/generators/netmvc/scaffold/README.md
-- lib/generators/netmvc/scaffold/Startup.cs.erb
 - lib/generators/netmvc/scaffold/_build/.gitignore
 - lib/generators/netmvc/scaffold/_build/.ruby-gemset.erb
 - lib/generators/netmvc/scaffold/_build/.ruby-version
@@ -102,9 +98,16 @@ files:
 - lib/generators/netmvc/scaffold/_build/features/steps/http.rb
 - lib/generators/netmvc/scaffold/_build/features/support/env.rb.erb
 - lib/generators/netmvc/scaffold/_build/swagger_spec/swagger.yml.erb
-- lib/generators/netmvc/scaffold/appsettings.json
-- lib/generators/netmvc/scaffold/project.json.erb
-- lib/generators/netmvc/scaffold/web.config
+- lib/generators/netmvc/scaffold/global.json
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/Controllers/HealthController.cs.erb
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/Program.cs.erb
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/Properties/launchSettings.json
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/Startup.cs.erb
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/appsettings.json
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/project.json.erb
+- lib/generators/netmvc/scaffold/src/<%= application_name %>/web.config
+- lib/generators/netmvc/scaffold/test/<%= application_name %>.Tests/Controllers/HealthControllerTest.cs.erb
+- lib/generators/netmvc/scaffold/test/<%= application_name %>.Tests/project.json.erb
 - lib/generators/netmvc/version.rb
 - minke-generator-netmvc.gemspec
 homepage: https://github.com/nicholasjackson/minkie-generator-netmvc