minke-generator-netmvc 0.1.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb4b5d8385a79c2ea372c961e857341deeec5ac
-  data.tar.gz: d94cefb86923bce6c741d17d4d5a80d71062fe50
+  metadata.gz: c8612be651b05fe26554839dad967b898a291e50
+  data.tar.gz: a2ced9f84409b2015923f1aea1220578eb572e4f
 SHA512:
-  metadata.gz: d5233f56e627266c613ad66d8c312490a2d1f2375533f305e7e9910d1454fdd69d12b924f8cbc3b7130e489b429382deb4d38ac12ecbd1ac64bd974c0e2e2940
-  data.tar.gz: 42a493d34840eba6b1449b404f9a8d0811b25af331e938468a68110517f29c48bd4ad95bc615a5afaf3c4707394b0cdc36757f5a020495a57a3d9a8aa8578518
+  metadata.gz: c3e7af3aff9b2cd0aab50ac50f8fb257b16d961c65586456daeaf86ba020ab4be94f42a0aecb6b27882b587a3e61177a5a829c56042135f5f8f1adf980b68a42
+  data.tar.gz: e5a89aff70cb64121224494aecd52918c74d4c29eadee9202d7bf80fbfba974fec26a8cbd7c90acaeb426336c6b263839fa206932a07c929ae1bab4a3b43bfc1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minke-generator-netmvc (0.1.0)
+    minke-generator-netmvc (0.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -42,9 +42,9 @@ GEM
       addressable (~> 2.3.8)
     jsonpath (0.5.8)
       multi_json
-    mime-types (2.99.1)
+    mime-types (2.99.2)
     mini_portile2 (2.0.0)
-    minke (1.0.1)
+    minke (1.0.6)
       colorize
       consul_loader (~> 1.0)
       cucumber

data/lib/generators/netmvc.rb

@@ -14,15 +14,15 @@ 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.build = [['/bin/bash', '-c', 'NUGET_PACKAGES=./.nuget dotnet build']]
-        bc.test = [['/bin/bash', '-c', 'NUGET_PACKAGES=./.nuget dotnet test']]
+        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']]
       end
 
       config.build_settings.docker_settings = Minke::Generators::DockerSettings.new.tap do |bs|
         bs.image = 'microsoft/dotnet:latest'
-        bs.binds = ["<%= src_root %>:/src"]
-        bs.working_directory = '/src' # working directory is added via a class patch to enable lazy load
+        bs.binds = ["<%= src_root %>/src:/<%= application_name %>"]
+        bs.working_directory = '/<%= application_name %>' # working directory is added via a class patch to enable lazy load
       end
 
       Minke::Generators.register config

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

@@ -0,0 +1,45 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/<%= application_name %>.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/<%= application_name %>.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "launchBrowser": {
+                "enabled": true,
+                "args": "${auto-detect-url}",
+                "windows": {
+                    "command": "cmd.exe",
+                    "args": "/C start ${auto-detect-url}"
+                },
+                "osx": {
+                    "command": "open"
+                },
+                "linux": {
+                    "command": "xdg-open"
+                }
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processName": "<example>"
+        }
+    ]
+}

data/lib/generators/netmvc/scaffold/.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "command": "dotnet",
+    "isShellCommand": true,
+    "args": [],
+    "tasks": [
+        {
+            "taskName": "build",
+            "args": [ ],
+            "isBuildCommand": true,
+            "showOutput": "silent",
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

data/lib/generators/netmvc/scaffold/Controllers/HealthController.cs.erb

@@ -13,7 +13,7 @@ namespace <%= namespace %>.Controllers
         [HttpGet]
         public HealthResponse Get()
         {
-            return new HealthResponse { Status = "ok" };
+            return new HealthResponse { Status = "OK" };
         }
     }
 }

data/lib/generators/netmvc/scaffold/Program.cs.erb

@@ -17,6 +17,7 @@ namespace <%= namespace %>
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
+                .UseUrls("http://0.0.0.0:5000")
                 .Build();
 
             host.Run();

data/lib/generators/netmvc/scaffold/Startup.cs.erb

@@ -28,7 +28,10 @@ namespace <%= namespace %>
         public void ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
-            services.AddMvc();
+            services.AddMvc().AddJsonOptions(options =>
+            {
+                options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

data/lib/generators/netmvc/scaffold/_build/Gemfile

@@ -4,8 +4,8 @@ gem "rake"
 gem 'cucumber-api', '~> 0.3'
 gem 'nokogiri'
 
-#gem 'minke'
-#gem 'minke-generator-go'
+gem 'minke'
+gem 'minke-generator-netmvc'
 
-gem 'minke', :path => '/Users/nicj/Developer/gems/minke'
-gem 'minke-generator-netmvc', :path => '/Users/nicj/Developer/gems/minke-generator-netmvc'
+#gem 'minke', :path => '/Users/nicj/Developer/gems/minke'
+#gem 'minke-generator-netmvc', :path => '/Users/nicj/Developer/gems/minke-generator-netmvc'

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

@@ -18,16 +18,16 @@ build:
     copy:
       -
         from: '../bin'
-        to: './dockerfile/<%= application_name %>/bin'
+        to: './dockerfile/<%= application_name %>'
       -
         from: '../.nuget'
-        to: './dockerfile/<%= application_name %>/.nuget'
+        to: './dockerfile/<%= application_name %>'
       -
         from: '../project.json'
-        to: './dockerfile/<%= application_name %>/project.json'
+        to: './dockerfile/<%= application_name %>'
       -
         from: '../web.config'
-        to: './dockerfile/<%= application_name %>/web.config'
+        to: './dockerfile/<%= application_name %>'
       -
         from: './swagger_spec/swagger.yml'
         to: './dockerfile/<%= application_name %>/swagger_spec'

data/lib/generators/netmvc/scaffold/_build/dockerfile/<%= application_name %>/Dockerfile.erb

@@ -32,5 +32,7 @@ ADD .nuget /<%= application_name %>/.nuget
 ADD web.config /<%= application_name %>/web.config
 ADD project.json /<%= application_name %>/project.json
 
+WORKDIR /<%= application_name %>
+
 ENTRYPOINT ["/bin/s6-svscan","/etc/s6"]
 CMD []

data/lib/generators/netmvc/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/app/run.erb

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+cd /<%= application_name %>
+export NUGET_PACKAGES=.nuget 
 exec dotnet run

data/lib/generators/netmvc/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/consul-template/run.erb

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec /bin/consul-template -consul=$CONSUL -template "/<%= application_name %>/appsettings.ctmpl:/<%= application_name %>/appsettings.json:killall <%= application_name %>"
+exec /bin/consul-template -consul=$CONSUL -template "/<%= application_name %>/appsettings.ctmpl:/<%= application_name %>/appsettings.json:pkill dotnet"

data/lib/generators/netmvc/scaffold/_build/features/health.feature

@@ -11,4 +11,4 @@ Scenario: Health check returns ok
 	Given I send and accept JSON
 	When I send a GET request to the api endpoint "/v1/health"
 	Then the response status should be "200"
-	And the JSON response should have key "status_message"
+	And the JSON response should have key "status"

data/lib/generators/netmvc/version.rb

@@ -1,7 +1,7 @@
 module Minke
   module Generators
     module NetMVC
-      VERSION = "0.1.0"
+      VERSION = "0.8.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke-generator-netmvc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,8 @@ files:
 - bin/setup
 - 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