minke-generator-swift 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28b45555f3efb17955be790d077b2506ed2c156
-  data.tar.gz: 8c9d5c76604e6e12e6d458c0a3398033ee39d90f
+  metadata.gz: f74008686bf775fecd1c1511f96f586093c1db64
+  data.tar.gz: 3dd624426aa025819317a24e91d3bc4201093d17
 SHA512:
-  metadata.gz: 93254b466bedaf2d3d5c62d408f2c7495280cc3eb468b7d4164bcde51e11b32470956c6b93b00d42bdf97e65e9c4bf99c08c006f52c5a03608003fc1f8917f56
-  data.tar.gz: c6479d11366775d1c7720b6e1541674311950531cffbe2fea63c3f3d44c8743727520fefce6a32d3a17b84e8752d3a561aaf05c1c30e3350330a7b5e4d51b170
+  metadata.gz: 5a5c2d9a36fd95802ab236f4d11141dba13cfd7d7dc8b9d184d1d6476eb051400ca23b66d380ebb0ddfd6ef429a2a76f31bc912a59d2fac519428e9d873c0260
+  data.tar.gz: 152747a6288b23f6283cffd56d7c53c225312c5247fb7f665a624d988607f11ac4b8099b9961e960a4012f00cc4cd8240cc8fbadf98952f4e1ce4ccb670db009

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store

data/README.md

@@ -8,7 +8,7 @@ For information on Minke please see the documentation [http://nicholasjackson.gi
 
 ## Available variables for templates (erb style)
 | Variable                | Description                            |
-| ----------------------- |                                        |
+| ----------------------- | -------------------------------------- |
 | <%= application_name %> | The name of the application executable |
 | <%= namespace %>        | Namespace of the application           |
 | <%= src_root %>         | Source root of the application         |
@@ -19,7 +19,7 @@ To scaffold a new service run:
 ```bash
 $ mkdir service
 $ cd service
-$ docker run --rm -v $(pwd):$(pwd) -w $(pwd) nicholasjackson/minke /bin/bash -c 'source /usr/local/rvm/scripts/rvm && minke -g minke-generator-swift -o $(pwd) -n swift.service -a service'
+$ curl -L -s get.minke.rocks | bash -s ' -g minke-generator-swift -o $(pwd) -n service -a service'
 ```
 
 ## Build and test with Docker

data/lib/generators/swift/scaffold/.gitignore

@@ -1 +1,2 @@
 vendor
+.build

data/lib/generators/swift/scaffold/src/Package.swift.erb

@@ -12,5 +12,5 @@ let package = Package(
     dependencies: [
       .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 0, minor: 20),
       .Package(url: "https://github.com/IBM-Swift/HeliumLogger", majorVersion: 0, minor: 9),
-      .Package(url: "https://github.com/notonthehighstreet/swift-statsd", majorVersion: 0, minor: 3)
+      .Package(url: "https://github.com/notonthehighstreet/swift-statsd", majorVersion: 0, minor: 4)
     ])

data/lib/generators/swift/scaffold/src/{<%= application_name %>App → Sources/<%= application_name %>App}/main.swift.erb

@@ -30,13 +30,10 @@ private func loadConfig() -> JSON? {
   {
     let config = JSON(data: jsonData)
     Log.info("Loaded config: \(config)")
-
     return config
-  } else {
-    Log.error("Unable to load config")
-
-    return nil
   }
+
+  return nil
 }
 
 setupLogger()
@@ -47,5 +44,5 @@ router = Routing(statsD: statsD!, config: config!).setupRouter()
 Log.info("Starting Server on port 8090:")
 statsD!.increment(bucket: "\(Buckets.Application.rawValue).\(Buckets.Started.rawValue)")
 
-let server = HTTPServer.listen(port: 8090, delegate: router!)
-Server.run()
+Kitura.addHTTPServer(onPort: 8090, with: router!)
+Kitura.run()

data/lib/generators/swift/version.rb

@@ -1,7 +1,7 @@
 module Minke
   module Generators
     module Swift
-      VERSION = "0.1.4"
+      VERSION = "0.1.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke-generator-swift
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,6 @@ files:
 - bin/setup
 - lib/generators/swift.rb
 - lib/generators/swift/commands.rb
-- lib/generators/swift/scaffold/.DS_Store
 - lib/generators/swift/scaffold/.gitignore
 - lib/generators/swift/scaffold/_build/.gitignore
 - lib/generators/swift/scaffold/_build/Gemfile
@@ -82,7 +81,6 @@ files:
 - lib/generators/swift/scaffold/_build/consul_keys.yml.erb
 - lib/generators/swift/scaffold/_build/dockercompose/<%= application_name %>/docker-compose.yml.erb
 - lib/generators/swift/scaffold/_build/dockercompose/<%= application_name %>/docker-no-server.yml.erb
-- lib/generators/swift/scaffold/_build/dockerfile/.DS_Store
 - lib/generators/swift/scaffold/_build/dockerfile/<%= application_name %>/.DS_Store
 - lib/generators/swift/scaffold/_build/dockerfile/<%= application_name %>/Dockerfile.erb
 - lib/generators/swift/scaffold/_build/dockerfile/<%= application_name %>/config.ctmpl.erb
@@ -97,17 +95,16 @@ files:
 - lib/generators/swift/scaffold/_build/features/steps/cucumer_rest_monkey_patch.rb
 - lib/generators/swift/scaffold/_build/features/support/env.rb.erb
 - lib/generators/swift/scaffold/_build/swagger_spec/swagger.yml.erb
-- lib/generators/swift/scaffold/src/<%= application_name %>/Config.swift
-- lib/generators/swift/scaffold/src/<%= application_name %>/handlers/HealthHandler.swift
-- lib/generators/swift/scaffold/src/<%= application_name %>/models/.DS_Store
-- lib/generators/swift/scaffold/src/<%= application_name %>/models/HealthHandlerResponse.swift
-- lib/generators/swift/scaffold/src/<%= application_name %>/models/JSONDictionary.swift
-- lib/generators/swift/scaffold/src/<%= application_name %>App/Metrics.swift
-- lib/generators/swift/scaffold/src/<%= application_name %>App/Routing.swift.erb
-- lib/generators/swift/scaffold/src/<%= application_name %>App/config.json
-- lib/generators/swift/scaffold/src/<%= application_name %>App/main.swift.erb
 - lib/generators/swift/scaffold/src/Makefile.erb
 - lib/generators/swift/scaffold/src/Package.swift.erb
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>/Config.swift
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>/handlers/HealthHandler.swift
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>/models/HealthHandlerResponse.swift
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>/models/JSONDictionary.swift
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>App/Metrics.swift
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>App/Routing.swift.erb
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>App/config.json
+- lib/generators/swift/scaffold/src/Sources/<%= application_name %>App/main.swift.erb
 - lib/generators/swift/scaffold/src/Tests/<%= application_name %>/HealthHandlerTests.swift.erb
 - lib/generators/swift/scaffold/src/Tests/<%= application_name %>/models/HealthHandlerResponseTests.swift.erb
 - lib/generators/swift/scaffold/src/Tests/LinuxMain.swift.erb