hemera 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16fdb9e56405f23e529e4a8138f7acc39b78e91811f76b7902ed41ac13bca1dc
-  data.tar.gz: 5d309219ec3c3020dfcc042acb3305de848dc0a2a03b0d800df4a00955f84632
+  metadata.gz: 74c81fc14b8105c9152c240b0fd1a86789aa5a98323cc6927567787096db32a5
+  data.tar.gz: ca196b1b0c7048a12bff91511a5a92d9c0e22fdc6a5d627d06bccd153440ccc3
 SHA512:
-  metadata.gz: 6e860a3aaeeb5e6ec563c02553ce65b6cb0d3447eac19f3a2754ba86e8ddb1179bb37d1b877e22203a86680bb69812e10687c9e57fb30477fdae07ba7b738ec8
-  data.tar.gz: 3a321f2afe973a6bd91aff2c1931c496078d8ec12f5bfaa4228597782600e50c7619367fd9e9a0008a46d23ee9e5b708f2d0a0fbee8f486659872a0087b2d656
+  metadata.gz: a6ad4566d9f99d7ac4b6c20b7127a36b87c1eacf19f84aecdf58528a681b2c659d82264d1f2a736c20ec7fc78c54d44d142086989fbee4832a8d9bc68a6aee59
+  data.tar.gz: 0bc05792d9f0149db8c9b3cf97073a340a4d8e007e389603cc5faf63932dd28d4928b0450a824a849d82c85724443e5e034e6c99bd929b116b884058ca560d24

data/.travis.yml

@@ -3,6 +3,6 @@ language: ruby
 rvm:
   - 2.5.1
 before_install: 
-  - gem install bundler -v 1.16.1
+  - gem install bundler
 script:
   - bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hemera (0.4.0)
+    hemera (0.5.0)
       gli (~> 2.18)
 
 GEM
@@ -112,4 +112,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/README.md

@@ -1,6 +1,7 @@
 # Hemera
 
 [![contact us](https://img.shields.io/discord/490015137181466645.svg)](https://discordapp.com/invite/RF2rWZ)
+[![Gem Version](https://badge.fury.io/rb/hemera.svg)](https://badge.fury.io/rb/hemera)
 [![Build Status](https://travis-ci.org/JianweiWangs/Hemera.svg?branch=master)](https://travis-ci.org/JianweiWangs/Hemera)
 [![codecov](https://codecov.io/gh/JianweiWangs/Hemera/branch/master/graph/badge.svg)](https://codecov.io/gh/JianweiWangs/Hemera)
 
@@ -55,7 +56,7 @@ SYNOPSIS
 COMMANDS
     img, i - generate img code
 ```
-![command_meta](resource/meta_command.gif)
+![command_meta](resource_md/meta_command.gif)
 
 use xcode subcommand can open/clean workspace
 

data/lib/hemera/source/meta/image/image_generator.rb

@@ -21,6 +21,8 @@ module Hemera
         @class_name = output_file_name
         @path = path
         @images = image_model_of_names
+        @bundle = path[/[A-Z, a-z, 0-9]+(?=\.bundle)/]
+        @bundle_path = path.gsub(@bundle + '.bundle', '') if @bundle
       end
 
       def find_paths_of_png(path = @path)
@@ -52,18 +54,17 @@ module Hemera
       end
 
       def generate(is_swift = true)
-        puts 'generating 😊'
         if is_swift
-          swift_file_path = @path + '/' + @class_name + '.swift'
+          swift_file_path = (@bundle_path ? @bundle_path : @path + '/')  + @class_name + '.swift'
           puts " #{swift_file_path} generating!"
           File.open(swift_file_path, 'w') do |f|
-            f.puts SwiftImageGenerator.new(@class_name, @images).swift_file
+            f.puts SwiftImageGenerator.new(@class_name, @images, @bundle).swift_file
           end
         else
-          interface_file_path = @path + '/' + @class_name + '.h'
-          implementent_file_path = @path + '/' + @class_name + '.m'
+          interface_file_path = (@bundle_path ? @bundle_path : @path + '/')  + @class_name + '.h'
+          implementent_file_path = (@bundle_path ? @bundle_path : @path + '/') + @class_name + '.m'
           puts " #{interface_file_path} and #{implementent_file_path} generating!"
-          objc_image_generator = ObjCImageGenerator.new(@class_name, @images)
+          objc_image_generator = ObjCImageGenerator.new(@class_name, @images, @bundle)
           File.open(interface_file_path, 'w') do |f|
             f.puts objc_image_generator.interface_file
           end

data/lib/hemera/source/meta/image/objc.rb

@@ -2,9 +2,10 @@ require 'erb'
 module Hemera
   module Generator
     class ObjCImageGenerator
-      def initialize(class_name, images)
+      def initialize(class_name, images, bundle_name)
         @class_name = class_name
         @images = images
+        @bundle_name = bundle_name
       end
 
       def interface_file
@@ -14,7 +15,6 @@ module Hemera
       def implementent_file
         ERB.new(File.read(File.expand_path('template/image.m.erb', __dir__))).result(binding)
       end
-
     end
   end
 end

data/lib/hemera/source/meta/image/swift.rb

@@ -2,9 +2,10 @@ require 'erb'
 module Hemera
   module Generator
     class SwiftImageGenerator
-      def initialize(struct_name, images)
+      def initialize(struct_name, images, bundle_name)
         @struct_name = struct_name
         @images = images
+        @bundle_name = bundle_name
       end
 
       def swift_file

data/lib/hemera/source/meta/image/template/image.m.erb

@@ -7,6 +7,21 @@
 
 <%= "#import \"#{@class_name}.h\"" %>
 
+<%= "@implementation UIImage (#{@class_name})" %>
+
+<%= "+ (UIImage *)#{@class_name.downcase}_imageNamed:(NSString *)name {" %>
+<% unless @bundle_name %>
+  <%= "\treturn [UIImage imageNamed:name];" %>
+  <% else %>
+  <%= "\tNSBundle *bundle = [NSBundle bundleForClass:self];"%>
+  <%= "\tNSURL *URL = [bundle URLForResource:@\"#{@bundle_name}\" withExtension:@\"bundle\"];"%>
+  <%= "\tNSBundle *resourceBundle = [NSBundle bundleWithURL:URL];" %>
+  <%= "\treturn [self imageNamed:name inBundle:resourceBundle compatibleWithTraitCollection:nil];"%>
+  <% end %>available
+<%= "}" %>
+
+@end
+
 <%= "@interface #{@class_name} ()" %>
 
 @property (nonatomic, readwrite) UIImage *light;
@@ -19,10 +34,10 @@
 <% for @image in @images %>
 <%= "+ (#{@class_name} *)#{@image.name} {"%>
 <%= "\t#{@class_name} *model = [#{@class_name} new];" %>
-<%= "\tmodel.light = [UIImage imageNamed:@\"#{@image.name_light}\"];" %>
-<%= "\tmodel.dark = [UIImage imageNamed:@\"#{@image.name_dark}\"];" %>
+<%= "\tmodel.light = [UIImage #{@class_name.downcase}_imageNamed:@\"#{@image.name_light}\"];" %>
+<%= "\tmodel.dark = [UIImage #{@class_name.downcase}_imageNamed:@\"#{@image.name_dark}\"];" %>
 <%= "\treturn model;" %>
 <%= "}" %>
 <% end %>
-@end
+<%= "@end" %>
 

data/lib/hemera/source/meta/image/template/image_swift.erb

@@ -6,12 +6,28 @@
  */
 
 import UIKit
+
+extension UIImage {
+<%= "\tpublic convenience init?(#{@struct_name.downcase} name: String) {"%>
+<% unless @bundle_name %>
+  <%= "\treturn UIImage(named: name)" %>
+<% else %>
+  <%= "\t\tlet bundle = Bundle(for: #{@struct_name}.Helper.self)" %>
+  <%= "\t\tlet url = bundle.url(forResource: \"#{@bundle_name}\", withExtension: \"bundle\")" %>
+  <%= "\t\tguard let availableURL = url else { return nil }" %>
+  <%= "\t\tlet resourceBundle = Bundle(url: availableURL)" %>
+  <%= "\t\tself.init(named: name, in: resourceBundle, compatibleWith: nil)" %>
+<% end %>
+    }
+}
+
 struct <%= @struct_name %> {
+    fileprivate class Helper {}
     private(set) lazy var dark: UIImage = {
-        return UIImage(named: darkName)!
+        return UIImage(<%= "#{@struct_name.downcase}" %>: darkName)!
     }()
     private(set) lazy var light: UIImage = {
-        return UIImage(named: lightName)!
+        return UIImage(<%= "#{@struct_name.downcase}" %>: lightName)!
     }()
     private let darkName: String
     private let lightName: String
@@ -24,4 +40,5 @@ struct <%= @struct_name %> {
     <%= "\treturn #{@struct_name}(darkName: \"#{@image.name_dark}\", lightName:\"#{@image.name_light}\")" %>
     <%= "}()" %>
 <% end %>
-}
+}
+

data/lib/hemera/version.rb

@@ -1,3 +1,3 @@
 module Hemera
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hemera
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - JianweiWangs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,22 +28,22 @@ dependencies:
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: development tool