metamodel 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ac592ba54f109f9c4dd66e14386c35651c7fe5
-  data.tar.gz: 428fc1d8078aec4812f2b8053757a5a730f8a01f
+  metadata.gz: 299648ce9da2c26b4d34f74f90acdfff7dff076c
+  data.tar.gz: b3d307c710260f446bd61c1b2aa0f049523d92b8
 SHA512:
-  metadata.gz: b0a5581fb5a1551cca3ed945943cfcf53f7489f3417d1711dd7091aaa01c0d6841331915915a0d3ef327a8bc15f4f4a464923188bf4278a17e9959a488372b9a
-  data.tar.gz: d67365c7b4b34688c787d5bdf86ea0eab19256c7d34ea875d46686051de1b3d5b7754e54ba7a5aee7fc152c21c1497c8e6c0b1bea50beae99075e010ae4a8b3d
+  metadata.gz: 3ab3d001805ebb322de152d52f9c01a973b3d329ae5fbe532f95d34ddfe3dec7c1c77f9e5c1b048aa2f0ace724c93e1da5de1779ad086d0adb4c167a3f2d8733
+  data.tar.gz: 3faf5fff2d4738bfe1fe140ce83f4c9f52ac8ab5548836f2863ae2d229496d5cc4621b467bf524af8d7f7c3ed28e68b55c7e8aa03e10e1bf3393206de3f9b1ad

data/README.md

@@ -99,7 +99,7 @@ Generating model files
 Generating MetaModel.framework
   -> MetaModel.framework located in current folder
 
-[!] Please drag MetaModel.framework into Linked Frameworks and Libraries section
+[!] Please drag MetaModel.framework into Linked Frameworks and Libraries phrase.
 ```
 
 This command build a `MetaModel.framework` in project root folder, you need to add this framework to **Linked frameworks and Libraries** phrase which located in `General` tab.

data/lib/metamodel/command/build.rb

@@ -33,7 +33,7 @@ module MetaModel
           UI.message "Existing project `#{config.metamodel_xcode_project}`"
         else
           UI.section "Cloning MetaModel project into `./metamodel` folder" do
-            Git.clone(config.metamodel_template_uri, 'MetaModel')
+            Git.clone(config.metamodel_template_uri, 'metamodel')
             UI.message "Using `./metamodel/MetaModel.xcodeproj` to build module"
           end
         end
@@ -58,10 +58,38 @@ module MetaModel
 
       def build_metamodel_framework
         UI.section "Generating MetaModel.framework" do
-          command = "xcodebuild -project metamodel/MetaModel.xcodeproj -scheme MetaModel > /dev/null 2>&1"
-          result = system command
+
+          build_iphoneos = "xcodebuild -scheme MetaModel \
+            -project MetaModel/MetaModel.xcodeproj \
+            -configuration Release -sdk iphoneos \
+            -derivedDataPath './metamodel' \
+            BITCODE_GENERATION_MODE=bitcode \
+            ONLY_ACTIVE_ARCH=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CODE_SIGN_IDENTITY="
+          build_iphonesimulator = "xcodebuild -scheme MetaModel \
+            -project MetaModel/MetaModel.xcodeproj \
+            -configuration Release -sdk iphonesimulator \
+            -derivedDataPath './metamodel' \
+            ONLY_ACTIVE_ARCH=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CODE_SIGN_IDENTITY="
+          result = system "#{build_iphoneos} > /dev/null &&
+            #{build_iphonesimulator} > /dev/null"
+
           raise Informative, 'Building framework failed.' unless result
-          result = system "cp -rf MetaModel/Build/Products/Debug-iphoneos/MetaModel.framework #{config.installation_root}"
+
+          build_products_folder = "./metamodel/Build/Products"
+
+          copy_command = "cp -rf #{build_products_folder}/Release-iphoneos/MetaModel.framework . && \
+            cp -rf #{build_products_folder}/Release-iphonesimulator/MetaModel.framework/Modules/MetaModel.swiftmodule/* \
+                    MetaModel.framework/Modules/MetaModel.swiftmodule/"
+          lipo_command = "lipo -create -output MetaModel.framework/MetaModel \
+            #{build_products_folder}/Release-iphonesimulator/MetaModel.framework/MetaModel \
+            #{build_products_folder}/Release-iphoneos/MetaModel.framework/MetaModel"
+
+          result = system "#{copy_command} && #{lipo_command}"
+
           raise Informative, 'Copy framework to current folder failed.' unless result
           UI.message "-> ".green + "MetaModel.framework located in current folder"
         end

data/lib/metamodel/template/file_header.swift.erb

@@ -7,4 +7,3 @@
 //
 
 import Foundation
-import SQLite

data/lib/metamodel/template/metamodel.swift.erb

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import SQLite
 
 let path = NSSearchPathForDirectoriesInDomains(
     .DocumentDirectory, .UserDomainMask, true
@@ -57,3 +56,20 @@ func executeSQL(sql: String, silent: Bool = false, success: (() -> ())? = nil) -
     }
     return nil
 }
+
+func executeScalarSQL(sql: String, silent: Bool = false, success: (() -> ())? = nil) -> Binding? {
+    defer { print("\n") }
+    print("-> Begin Transaction")
+    let startDate = NSDate()
+    let result = db.scalar(sql)
+    let endDate = NSDate()
+    let interval = endDate.timeIntervalSinceDate(startDate) * 1000
+    print("\tSQL (\(interval.format("0.2"))ms) \(sql)")
+    print("-> Commit Transaction")
+
+    if let success = success {
+        success()
+    }
+
+    return result
+}

data/lib/metamodel/template/static_methods.swift.erb

@@ -5,7 +5,7 @@ public extension <%= model.name %> {
     }
     static func count() -> Int {
         let countSQL = "SELECT count(*) FROM \(tableName.unwrapped)"
-        guard let count = executeSQL(countSQL)?.next()?.first as? Int64 else { return 0 }
+        guard let count = executeScalarSQL(countSQL) as? Int64 else { return 0 }
         return Int(count)
     }
 

data/lib/metamodel/version.rb

@@ -1,5 +1,5 @@
 module MetaModel
   # The version of the MetaModel command line tool.
   #
-  VERSION = '0.0.4'.freeze unless defined? MetaModel::MetaModel
+  VERSION = '0.0.5'.freeze unless defined? MetaModel::MetaModel
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamodel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The Cocoa models generator.