gena 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a49a3d4b92b77790f89ee8b0f4d87ee866d4f4c
-  data.tar.gz: 1dc2a06d1290fbd8df144e1e0089fb5ea921b6d6
+  metadata.gz: 6f07c5d4850c7e57ff1c5dd647a4902485a071a7
+  data.tar.gz: b9f719f69a220de2c24bc3d30ba25a36eae6f485
 SHA512:
-  metadata.gz: eb4d8a23274ff80132c3a882490dd3723712b4d8972cf33ca696d3d6a8c1a41c5c032a908dc123e27212be7952cd1fa1c74d9e979f1aa0e6c5e6d6af1933c175
-  data.tar.gz: ddfa2b043f06fb053899161dc7843528f02ce8782ed606f6f19380c00af71f3f4c4110c25be43f0814eaeac4fbe7bdd3c850af9ecf5d647e13f990ff3fe3d3f3
+  metadata.gz: 1570379e275c758442502a92eab49ded53f327f9a6e53a1bab6c4902c8b7e5c9001c4e6b68d7eebb4dbb288ec599939c466913c0905c1fb38118eb6b65c9a61f
+  data.tar.gz: cd64ca0944515d7836599ab245cc19d4c678fc748e2ed1c2b553e5b951a7b921abf26a1cca7535938d6ef93905873523c2fe3639dac996758a8ad97b9efc8710

data/lib/cli/cli.rb

@@ -70,7 +70,9 @@ module Gena
         clazz = command_name ? class_for_command[command_name] : nil
 
         if command_name && clazz
-          clazz.dispatch(nil, given_args.dup, nil, config)
+          if check_dependencies(command_name, clazz.dependencies)
+            clazz.dispatch(nil, given_args.dup, nil, config)
+          end
         else
           dispatch(nil, given_args.dup, nil, config)
         end
@@ -124,12 +126,49 @@ module Gena
         if tag_name > VERSION
           say "New update v#{tag_name} is available for gena.\nSee release notes: #{data['url']}", Color::YELLOW
           if data['body'].length > 0
-          say "---------------------\n#{data['body']}\n---------------------", Color::YELLOW
+            say "---------------------\n#{data['body']}\n---------------------", Color::YELLOW
           end
           say "Please update by:\n#{set_color('gem install gena', Color::GREEN)}", Color::YELLOW
         end
 
       end
+
+      def self.check_dependencies(plugin_name, dependencies)
+
+        missing_gems = {}
+
+        dependencies.each do |gem_name, version|
+          begin
+            require gem_name
+          rescue LoadError
+            missing_gems[gem_name] = version
+          end
+        end
+
+        if missing_gems.count > 0
+          puts "The following gems required for #{plugin_name.yellow}:\n\t#{missing_gems.keys.join(', ')}"
+          puts "Would you like to install them? (Yn)"
+          answer = STDIN.gets.chomp
+          if answer == 'Y' || answer == 'y' || answer == '' || answer == 'yes'
+            gems = missing_gems.collect { |k, v| "#{k}:#{v}" }
+            command = "gem install #{gems.join(" ")}"
+            puts command
+            result = system(command)
+            if result
+              puts "All dependencies installed successfully! Run your command again.".green
+            else
+              puts "Error occured while installing dependencies. Please install them manually and try again.".red
+            end
+            return false
+          else
+            puts "Unable to run #{plugin_name}. Please install dependencies and try again.".red
+            return false
+          end
+        else
+          return true
+        end
+      end
+
     end
 
   end

data/lib/cli/init.rb

@@ -2,7 +2,7 @@ module Gena
 
   class Application < Thor
 
-    desc 'reconfigure [COMMAND]', 'Restores default parameters for plugin inside gena.plist'
+    desc 'reconfigure [PLUGIN]', 'Restores default parameters for plugin inside gena.plist'
     def reconfigure(command)
 
       $config = Gena::Config.new
@@ -45,17 +45,16 @@ module Gena
         end
       end
 
-      sources_path = common_path_in_target(main_target, 'main.m')
-      tests_path = common_path_in_target(test_target, "#{sources_path}/")
-
-      sources_path = relative_to_current_dir(sources_path)
-      tests_path = relative_to_current_dir(tests_path)
-
       hash = Hash.new
       hash[:plugins_url] = [
           'https://github.com/alexgarbarev/gena-plugins.git'
       ]
 
+      unless main_target
+        say "Can't find application target in your Xcode project. Please create application target and try again", Color::RED
+        abort
+      end
+
       default_build_configuration = main_target.build_configuration_list.default_configuration_name || 'Debug'
       info_plist_value = main_target.build_configuration_list.get_setting('INFOPLIST_FILE')[default_build_configuration]
       if info_plist_value['$(SRCROOT)/']
@@ -65,11 +64,30 @@ module Gena
       hash['company'] = xcode_project.root_object.attributes['ORGANIZATIONNAME'].to_s
       hash['prefix'] = xcode_project.root_object.attributes['CLASSPREFIX'].to_s
       hash['project_name'] = xcode_project.root_object.name
-      hash['project_target'] = main_target.name
-      hash['test_target'] = test_target.name
       hash['info_plist'] = info_plist_value
-      hash['sources_dir'] = ask_with_default("Enter path for #{set_color('sources', Color::YELLOW)} or ENTER to continue (#{sources_path}):", sources_path)
-      hash['tests_dir'] = ask_with_default("Enter path for #{set_color('tests', Color::YELLOW)} or ENTER to continue (#{tests_path}):", tests_path)
+
+      if main_target
+        sources_path = common_path_in_target(main_target, 'main.m')
+        sources_path = relative_to_current_dir(sources_path)
+
+        hash['project_target'] = main_target.name
+        hash['sources_dir'] = ask_with_default("Enter path for #{set_color('sources', Color::YELLOW)} or ENTER to continue (#{sources_path}):", sources_path)
+     end
+
+      if test_target
+        tests_path = common_path_in_target(test_target, "#{sources_path}/")
+        tests_path = relative_to_current_dir(tests_path)
+
+        hash['test_target'] = test_target.name
+        hash['tests_dir'] = ask_with_default("Enter path for #{set_color('tests', Color::YELLOW)} or ENTER to continue (#{tests_path}):", tests_path)
+      else
+        say "Can't find target for UnitTests. You setup it later using 'test_target' and 'tests_dir' key (similar to sources)", Color::YELLOW
+        hash['test_target'] = ''
+        hash['tests_dir'] = ''
+      end
+
+      language = file_exists_in_target?(main_target, 'main.m') ? "objc" : "swift"
+      hash['language'] = ask_with_default("Enter main #{set_color('language', Color::YELLOW)} or ENTER to continue (#{language}):", language)
 
       say '===============================================================', Color::YELLOW
       print_table(hash)
@@ -98,7 +116,7 @@ module Gena
             init
             ARGV.replace([])
           else
-            if yes? "'gena.plist' is not exists. Do you want to create new one? (Y/n)", Color::YELLOW
+            unless no? "'gena.plist' is not exists. Do you want to create new one? (Y/n)", Color::YELLOW
               init
             end
           end
@@ -287,6 +305,15 @@ module Gena
         common
       end
 
+      def file_exists_in_target?(target, file_name)
+        target.source_build_phase.files.each do |file|
+          if File.basename(file.file_ref.real_path.to_s) == file_name
+            return true
+          end
+        end
+        false
+      end
+
     end
 
   end

data/lib/constants.rb

@@ -2,6 +2,5 @@ module Gena
   GENA_HOME = '~/.gena'
   GENA_UPDATE_CHECK_INTERVAL = 10800
   GENA_PLUGINS_CONFIG_KEY = 'configs'
-  VERSION = '0.1.3'
-  RELEASE_DATE = '2018-05-29'
+  VERSION = '0.1.4'
 end

data/lib/plugin/plugin.rb

@@ -25,6 +25,10 @@ module Gena
 
     no_tasks do
 
+      def self.dependencies
+        return { }
+      end
+
       def config
         config = $config.data
         config.reject { |k, v| k == GENA_PLUGINS_CONFIG_KEY }

data/lib/utils/utils.rb

@@ -74,4 +74,30 @@ def common_path(paths)
     common = common[0..-2]
   end
   common
+end
+
+class String
+  def black;          "\e[30m#{self}\e[0m" end
+  def red;            "\e[31m#{self}\e[0m" end
+  def green;          "\e[32m#{self}\e[0m" end
+  def brown;          "\e[33m#{self}\e[0m" end
+  def blue;           "\e[34m#{self}\e[0m" end
+  def magenta;        "\e[35m#{self}\e[0m" end
+  def cyan;           "\e[36m#{self}\e[0m" end
+  def gray;           "\e[37m#{self}\e[0m" end
+
+  def bg_black;       "\e[40m#{self}\e[0m" end
+  def bg_red;         "\e[41m#{self}\e[0m" end
+  def bg_green;       "\e[42m#{self}\e[0m" end
+  def bg_brown;       "\e[43m#{self}\e[0m" end
+  def bg_blue;        "\e[44m#{self}\e[0m" end
+  def bg_magenta;     "\e[45m#{self}\e[0m" end
+  def bg_cyan;        "\e[46m#{self}\e[0m" end
+  def bg_gray;        "\e[47m#{self}\e[0m" end
+
+  def bold;           "\e[1m#{self}\e[22m" end
+  def italic;         "\e[3m#{self}\e[23m" end
+  def underline;      "\e[4m#{self}\e[24m" end
+  def blink;          "\e[5m#{self}\e[25m" end
+  def reverse_color;  "\e[7m#{self}\e[27m" end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gena
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Aleksey Garbarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -90,26 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: ttfunk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 description: Code generation and automation tool
 email: alex.garbarev@gmail.com
 executables: