metamodel 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5027faa28bcf3e7d87ba3e152f2f812562237c49
-  data.tar.gz: b78d7293ab4a90fdc831f6e7b94b2d802d306f9a
+  metadata.gz: a0ac592ba54f109f9c4dd66e14386c35651c7fe5
+  data.tar.gz: 428fc1d8078aec4812f2b8053757a5a730f8a01f
 SHA512:
-  metadata.gz: c4f4929a6cebae8736d7783a493312251ea668942ab6689f09ad032669f2bce5432ed985402af02e3ed4a27669502c85e6eb3934b515616d2d3a1f47f982bbfe
-  data.tar.gz: 24de521af1ada8393bb874aab884be227cdbee438c0984a403535b311131011175340d0e0d78426672c719b866e710aa917009522b9834999494596e1872b1d8
+  metadata.gz: b0a5581fb5a1551cca3ed945943cfcf53f7489f3417d1711dd7091aaa01c0d6841331915915a0d3ef327a8bc15f4f4a464923188bf4278a17e9959a488372b9a
+  data.tar.gz: d67365c7b4b34688c787d5bdf86ea0eab19256c7d34ea875d46686051de1b3d5b7754e54ba7a5aee7fc152c21c1497c8e6c0b1bea50beae99075e010ae4a8b3d

data/README.md

@@ -87,21 +87,24 @@ Edit meta file using vim, Emacs or other editor and run `meta build`.
 ```shell
 $ meta build
 
-Building MetaModel project
-
-Cloning MetaModel project into `./MetaModel` folder
-Using `./MetaModel/MetaModel.xcodeproj` to build module
+Building MetaModel.framework in project
+  Existing project `./metamodel/MetaModel.xcodeproj`
 
 Analyzing meta files
--> Resolving `user.rb`
+  -> Resolving `user.rb`
 
 Generating model files
--> Using User.swift file
+  -> Using User.swift file
+
+Generating MetaModel.framework
+  -> MetaModel.framework located in current folder
+
+[!] Please drag MetaModel.framework into Linked Frameworks and Libraries section
 ```
 
-This command create a brand new xcode project in `./MetaModel` folder, just add the `MetaModel.project` into your project or workspace. And add `MetaModel.framework` to **Linked frameworks and Libraries** phrase which located in `General` tab.
+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.
 
-![add-metamodel-project-demo](images/add-metamodel-project-demo.png)
+![integrate-metamodel-framework](images/integrate-metamodel-framework.png)
 
 Add this line of code in your project.
 

data/lib/metamodel/command/build.rb

@@ -18,21 +18,23 @@ module MetaModel
       end
 
       def run
-        UI.section "Building MetaModel project" do
+        UI.section "Building MetaModel.framework in project" do
           clone_project
           parse_template
           render_model_files
           update_initialize_method
+          build_metamodel_framework
         end
+        UI.notice "Please drag MetaModel.framework into Linked Frameworks and Libraries phrase.\n"
       end
 
       def clone_project
         if File.exist? config.metamodel_xcode_project
           UI.message "Existing project `#{config.metamodel_xcode_project}`"
         else
-          UI.section "Cloning MetaModel project into `./MetaModel` folder" do
+          UI.section "Cloning MetaModel project into `./metamodel` folder" do
             Git.clone(config.metamodel_template_uri, 'MetaModel')
-            UI.message "Using `./MetaModel/MetaModel.xcodeproj` to build module"
+            UI.message "Using `./metamodel/MetaModel.xcodeproj` to build module"
           end
         end
       end
@@ -47,14 +49,24 @@ module MetaModel
           Renderer.render(@models)
         end
       end
-
       def update_initialize_method
         template = File.read File.expand_path(File.join(File.dirname(__FILE__), "../template/metamodel.swift.erb"))
         result = ErbalT::render_from_hash(template, { :models => @models })
-        model_path = Pathname.new("./MetaModel/MetaModel/MetaModel.swift")
+        model_path = Pathname.new("./metamodel/MetaModel/MetaModel.swift")
         File.write model_path, result
       end
 
+      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
+          raise Informative, 'Building framework failed.' unless result
+          result = system "cp -rf MetaModel/Build/Products/Debug-iphoneos/MetaModel.framework #{config.installation_root}"
+          raise Informative, 'Copy framework to current folder failed.' unless result
+          UI.message "-> ".green + "MetaModel.framework located in current folder"
+        end
+      end
+
       def validate!
         super
         raise Informative, 'No meta folder in directory' unless config.meta_path_in_dir(Pathname.pwd)

data/lib/metamodel/command/build/renderer.rb

@@ -45,7 +45,7 @@ module MetaModel
               result = templates.map { |template|
                 ErbalT::render_from_hash(template, { :model => model })
               }.join("\n")
-              model_path = Pathname.new("./MetaModel/MetaModel/#{model.name}.swift")
+              model_path = Pathname.new("./metamodel/MetaModel/#{model.name}.swift")
               File.write model_path, result
 
               file_refs << models_group.new_reference(Pathname.new("MetaModel/#{model.name}.swift"))

data/lib/metamodel/config.rb

@@ -74,7 +74,7 @@ module MetaModel
     # @return [String]
     #
     def metamodel_xcode_project
-      "./MetaModel/MetaModel.xcodeproj"
+      "./metamodel/MetaModel.xcodeproj"
     end
 
     # Returns whether or not meta folder is in current project.

data/lib/metamodel/model/cocoa_property.rb

@@ -21,7 +21,7 @@ module MetaModel
     end
 
     def type_without_optional
-      return type.to_s[0..-2] if key.to_s.end_with? "?"
+      return type.to_s[0..-2] if type.to_s.end_with? "?"
       type
     end
 

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

@@ -19,18 +19,14 @@ public extension <%= model.name %> {
 
         columnsSQL.append(.id)
         valuesSQL.append(id)
-
         <% model.properties_exclude_id.each do |property| %><% if property.is_optional? %>
         <%= """if let #{property.key} = #{property.key} {
             columnsSQL.append(.#{property.key})
             valuesSQL.append(#{property.key})
-        }
-        """ %>
-        <% else %>
+        }""" %><% else %>
         <%= """columnsSQL.append(.#{property.key})
-            valuesSQL.append(#{property.key})
-        """ %>
-        <% end %><% end %>
+        valuesSQL.append(#{property.key})
+        """ %><% end %><% end %>
 
         let insertSQL = "INSERT INTO \(tableName.unwrapped) (\(columnsSQL.map { $0.rawValue }.joinWithSeparator(", "))) VALUES (\(valuesSQL.map { $0.unwrapped }.joinWithSeparator(", ")))"
         guard let _ = executeSQL(insertSQL) else { return nil }

data/lib/metamodel/version.rb

@@ -1,5 +1,5 @@
 module MetaModel
   # The version of the MetaModel command line tool.
   #
-  VERSION = '0.0.3'.freeze unless defined? MetaModel::MetaModel
+  VERSION = '0.0.4'.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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Draveness Zuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -163,7 +163,7 @@ files:
 - lib/metamodel/template/static_methods.swift.erb
 - lib/metamodel/user_interface.rb
 - lib/metamodel/version.rb
-homepage: https://github.com/Draveness/MetaModel
+homepage: https://github.com/MModel/MetaModel
 licenses:
 - MIT
 metadata: {}