minke-generator-swift 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60fc06b6b6f94efc25a743b8707601e37594457
-  data.tar.gz: 5d6cbd2d67fa251f0e7d0f2c4cbf554ec328de5e
+  metadata.gz: f28b45555f3efb17955be790d077b2506ed2c156
+  data.tar.gz: 8c9d5c76604e6e12e6d458c0a3398033ee39d90f
 SHA512:
-  metadata.gz: eb9ae97f3dd5435d15051c8f13112478f26c28ab6fc9f4d6c2bc2c182b16004a11582f81d0e946a7d576320e0130142f9f39d90e5d5184d23e3dbc84554cc3a0
-  data.tar.gz: 18ba97a21a073463cbe7d738c4d723f982af51a69dc570094fe16c49c46edd40af4d289993b7ccc90c4437157f676d856da0a05207d3b8b0b9d4112a7a968ce1
+  metadata.gz: 93254b466bedaf2d3d5c62d408f2c7495280cc3eb468b7d4164bcde51e11b32470956c6b93b00d42bdf97e65e9c4bf99c08c006f52c5a03608003fc1f8917f56
+  data.tar.gz: c6479d11366775d1c7720b6e1541674311950531cffbe2fea63c3f3d44c8743727520fefce6a32d3a17b84e8752d3a561aaf05c1c30e3350330a7b5e4d51b170

data/README.md

@@ -13,51 +13,28 @@ For information on Minke please see the documentation [http://nicholasjackson.gi
 | <%= namespace %>        | Namespace of the application           |
 | <%= src_root %>         | Source root of the application         |
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'minke'
-gem 'minke-generator-swift'
-```
-
-And then execute:
-```
-$ bundle
-```
-
-Or install it yourself:
-
-```
-$ gem install minke
-$ gem install minke-generator-swift
-```
-
 ## Usage
 To scaffold a new service run:
 
 ```bash
-$ minke -g minke-generator-swift -o ~/nicholasjackson/helloworld
-  -a helloworld -n HelloWorld
+$ 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'
 ```
 
-You can now open the project in [VisualStudio Code](http://code.visualstudio.com) and run your first build.
-
 ## Build and test with Docker
 To run a build with a Docker container, to execute the functional and unit tests you can use the following commands.  Please see the main Minke documentation for more information [http://nicholasjackson.github.io/minke/](http://nicholasjackson.github.io/minke/).
 
 ### Build Application Code and Execute Unit tests
 ```bash
 $ cd _build
-$ bundle
-$ rake app:test
+$ ./minke.sh rake app:test
 ```
 
 ### Build a Docker image and execute functional tests with Cucumber
 ```bash
-$ rake app:build_image
-$ rake app:cucumber
+$ ./minke.sh rake app:build_image
+$ ./minke.sh rake app:cucumber
 ```
 
 ## Development

data/lib/generators/swift.rb

@@ -14,7 +14,7 @@ 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', 'swift build --fetch'], ['/bin/bash', '-c', 'find Packages/ -type d -name Tests | xargs rm -rf']]
+        bc.fetch = [['/bin/bash', '-c', 'swift package fetch'], ['/bin/bash', '-c', 'find Packages/ -type d -name Tests | xargs rm -rf'], ['/bin/bash', '-c', 'swift package generate-xcodeproj']]
         bc.build = [['/bin/bash', '-c', 'swift build -Xcc -fblocks']]
         bc.test  = [['/bin/bash', '-c', 'swift test']]
       end

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

@@ -0,0 +1 @@
+vendor

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

@@ -31,7 +31,7 @@ run:
       url:
         address: consul
         port: 8500
-        type: private
+        type: bridge
 cucumber:
   pre:
     consul_loader:
@@ -39,9 +39,9 @@ cucumber:
       url:
         address: consul
         port: 8500
-        type: private
+        type: bridge
     health_check:
       address: <%= application_name %>
       port: 8090
       path: /v1/health
-      type: private
+      type: bridge

data/lib/generators/swift/scaffold/_build/features/support/env.rb.erb

@@ -3,8 +3,8 @@ require 'rest-client'
 
 require 'minke'
 
-discovery = Minke::Docker::ServiceDiscovery.new 'config.yml'
-$SERVER_PATH = "http://#{discovery.public_address_for '<%= application_name %>', '8090', :cucumber}"
+discovery = Minke::Docker::ServiceDiscovery.new ENV['DOCKER_PROJECT'], Minke::Docker::DockerRunner.new
+$SERVER_PATH = "http://#{discovery.bridge_address_for ENV['DOCKER_NETWORK'], '<%= application_name %>', '8090'}"
 
 Before do |scenario|
 

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

@@ -9,7 +9,7 @@ BUILDCOMMAND := "swift build -Xcc -fblocks -Xlinker -rpath -Xlinker .build/debug
 endif
 
 fetch:
-	swift build --fetch
+	swift package fetch
 	find Packages/ -type d -name Tests | xargs rm -rf
 clean:
 	@echo --- Invoking swift build --clean
@@ -22,4 +22,4 @@ test: build
 	swift test
 run: build
 	@echo --- Starting server
-	.build/debug/StockServiceApp ./Sources/<%= application_name %>App/config.json
+	.build/debug/<%= application_name %>App ./Sources/<%= application_name %>App/config.json

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

@@ -10,12 +10,7 @@ let package = Package(
         name: "<%= application_name %>")
     ],
     dependencies: [
-      .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 0, minor: 16),
+      .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-mysql", majorVersion: 0, minor: 11),
-.Package(url: "https://github.com/notonthehighstreet/swift-statsd", majorVersion: 0, minor: 3)
-*/

data/lib/generators/swift/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke-generator-swift
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,8 +76,6 @@ files:
 - lib/generators/swift/scaffold/.DS_Store
 - lib/generators/swift/scaffold/.gitignore
 - lib/generators/swift/scaffold/_build/.gitignore
-- lib/generators/swift/scaffold/_build/.ruby-gemset.erb
-- lib/generators/swift/scaffold/_build/.ruby-version
 - lib/generators/swift/scaffold/_build/Gemfile
 - lib/generators/swift/scaffold/_build/Rakefile
 - lib/generators/swift/scaffold/_build/config.yml.erb

data/lib/generators/swift/scaffold/_build/.ruby-gemset.erb

@@ -1 +0,0 @@
-<%= application_name %>

data/lib/generators/swift/scaffold/_build/.ruby-version

@@ -1 +0,0 @@
-2.3.1