kilza 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1399ff570feae81c6563af28176cf00c299b457f
-  data.tar.gz: e800dd1435fc52614ea820b2e328925d0115bd88
+  metadata.gz: 19afa4576243d4b81618c7a96e3fcfc171d1e40c
+  data.tar.gz: 5ebd96dd828845962476cd04e9d9b1c5f2c581e4
 SHA512:
-  metadata.gz: 63d33a06e41782c5e2d7d77d3141e2d58fa5e246616e0b91021b89cd5470991aa0483ec15fa2e031c4e9e4da159bb70d57cfa45d45f1a54ff5dcc8abcd838124
-  data.tar.gz: ecc51bd08e3a2b6803f9827870e2e1ecf41cf233269f742249211e1b39202211312038ac91f9c5b32e5ba08f01e5f6aa9180ba01ed1b8ae3322f542b7a9172b3
+  metadata.gz: 7359efe86778e41c19a07fbd9b2e7719d73db4626c4630f1944d9ba4ab4c4576efd9c4155f5d88cdb3f720012617b4bb3a8d0ad9b88f8db6178fc131a931a2e5
+  data.tar.gz: 08bbb522b1b72075a981a2accd3ea2d4db85629cf417d0c22eb4f871bbb5d14428322f99297e78b0941788ce467d2a8610b894ba42efd7c54bf4f8e67e54c09e

data/bin/kilza

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'highline'
 require 'kilza'
+require 'pastel'
+require 'tty'
+require 'tty-prompt'
+require 'tty-spinner'
 require 'net/http'
 require 'uri'
 
@@ -10,101 +13,118 @@ def read_url(url)
   Net::HTTP.get(URI.parse(url))
 end
 
-cli = HighLine.new
-cli.say "Hi <%= color('master', BOLD) %>. I can convert your JSON string to Object files.\n\n"
-
-loop do
-  begin
-    cli.say "<%= color('What can I do for you?', BOLD) %>"
-    cli.choose do |menu|
-      menu.prompt = ""
-      menu.choice("I want some JSON objects.") {
-      }
-      menu.choice("Nothing.") {
-        break
-      }
+module TTY
+  class Prompt
+    class List
+      def numpad(value)
+        @numpad = value
+      end
     end
+  end
+end
 
-    json_is_url = false
-    cli.say "<%= color('\nWhere is your JSON string content?', BOLD) %>"
-    cli.choose do |menu|
-      menu.prompt = ""
-      menu.choice("It's online. I have an URL.") {
-        json_is_url = true
-      }
-      menu.choice("It's offline. I have the file path.") { cli.say("Ok.") }
-    end
+class KilzaApplication
 
-    json_string = ''
-    if (json_is_url)
-      url = cli.ask ("<%= color('\nPlease, what is the URL?', BOLD) %>")
-      cli.say("<%= color('\nOk. I\\'ll try to get the content right now.', BOLD) %>")
-      json_string = read_url(url)
-    else
-      file_path = cli.ask ("<%= color('\nPlease, what is the file path?', BOLD) %>")
-      json_string = File.read(file_path)
-    end
+  def initialize
+    @pastel = Pastel.new
+    @prompt = TTY::Prompt.new
+    @spinner = TTY::Spinner.new
 
-    target_path = cli.ask "<%= color('\nMaster, where would you like to save?', BOLD) %>"
-    target_path = File.expand_path(target_path)
-
-    class_basename = cli.ask "<%= color('\nMaster, which name would like to call the first class?', BOLD) %>"
-
-    target_lang = ''
-    cli.say("<%= color('\nPlease choose your target programming language?', BOLD) %>")
-    cli.choose do |menu|
-      menu.prompt = ""
-      menu.choice("Objective-C") {
-        target_lang = "objc"
-      }
-      menu.choice("Java") {
-        target_lang = "java"
-      }
-    end
+    @done = false
+  end
 
-    cli.say "<%= color('\nIs that correct?', BOLD) %>"
-    cli.say("Target: " + target_path)
-    cli.say("Base class name:" + class_basename)
-    cli.say("Target language:" + target_lang)
-
-    cli.choose do |menu|
-      menu.prompt = ""
-      menu.choice("Yes.") {
-      }
-      menu.choice("No.") {
-        break
-      }
+  def get_lang
+    action = @prompt.select(@pastel.bold("Target programming language?")) do |menu|
+      menu.default 1
+      menu.numpad true
+
+      menu.choice "Objective-C", 1
+      menu.choice "Java", 2
     end
+    action
+  end
 
-    cli.say("<%= color('\nYes master. Now I\\'m going to generate all files.', BOLD) %>")
-    cli.say("<%= color('Berebekan Katabamba Berebekan Katabamba Berebekan Katabamba', BOLD) %>")
+  def get_json
+    action = @prompt.select(@pastel.bold("Where is your JSON string content?")) do |menu|
+      menu.default 1
+      menu.numpad true
 
-    if (target_lang == "objc")
-      objc = Kilza::Objc.new(json_string)
-      objc.classes(class_basename).each { |c|
-        c.sources.each{ |s|
-          File.write(File.join(target_path, s.file_name), s.source)
-        }
-      }
-    else
-      java = Kilza::Java.new(json_string)
-      java.classes(class_basename).each { |c|
-        c.sources.each{ |s|
-          File.write(File.join(target_path, s.file_name), s.source)
-        }
-      }
+      menu.choice "It's online. I have an URL.", 1
+      menu.choice "It's offline. I have the file path.", 2
     end
 
-    cli.say("<%= color('\nKikera!', BOLD) %>")
+    json_string = ''
+    if (action == 1)
+      url = @prompt.ask(@pastel.bold("Please, what is the URL?")) do |q|
+        q.required true
+      end
+      @prompt.say(@pastel.bold("Ok. I'll try to get the content right now."))
+      json_string = read_url(url)
+    else
+      file_path = File.expand_path(@prompt.ask(@pastel.bold("Please, what is the file path? "))) do |q|
+        q.required true
+      end
+      json_string = File.read(file_path.chomp)
+    end
+    json_string
+  end
 
-  rescue EOFError  # HighLine throws this if @input.eof?
-    break
-  rescue => e
-    cli.say("<%= color('\nOh master. Sorry, but I\\'ve encountered an error:', BOLD) %>")
-    puts e
-    puts "\n"
+  def run
+    while (not @done)
+      action = @prompt.select(@pastel.bold("Choose your destiny?")) do |menu|
+        menu.default 1
+        menu.numpad true
+
+        menu.choice 'I want some JSON objects.', 1
+        menu.choice 'Nothing.', 2
+      end
+      if action == 1
+        json_string = get_json
+        target_path = @prompt.ask(@pastel.bold("Master, where would you like to save? ")).chomp
+        target_path = File.expand_path(target_path)
+        class_basename = @prompt.ask(@pastel.bold("Master, which name would like to call the first class? ")).chomp
+        lang = get_lang
+
+        class_package = nil
+        if (lang == 2)
+          class_package = @prompt.ask(@pastel.bold("What is the target Java package? ")).chomp
+        end
+
+        @prompt.say(@pastel.bold("Target: ") + target_path)
+        @prompt.say(@pastel.bold("Base class name: ") + class_basename)
+        @prompt.say(@pastel.bold("Target language: ") + (lang == 1 ? 'Objective-C' : 'Java'))
+        if (not class_package.nil?)
+          @prompt.say(@pastel.bold("Target package: ") + class_package)
+        end
+        ok = @prompt.yes?('Is that correct?')
+        if (ok.nil? or ok)
+          @prompt.say(@pastel.bold("Yes master. Now I'm going to generate all files."))
+          @prompt.say(@pastel.bold("Berebekan Katabamba Berebekan Katabamba Berebekan Katabamba"))
+
+          if (lang == 1)
+            objc = Kilza::Objc.new(json_string)
+            objc.classes(class_basename).each { |c|
+              c.sources.each{ |s|
+                File.write(File.join(target_path, s.file_name), s.source)
+              }
+            }
+          else
+            java = Kilza::Java.new(json_string)
+            java.classes(class_basename).each { |c|
+              c.package = class_package
+              c.sources.each{ |s|
+                File.write(File.join(target_path, s.file_name), s.source)
+              }
+            }
+          end
+
+          @prompt.say(@pastel.bold("Kikera!"))
+        end
+      else
+        @done = true
+      end
+    end
   end
 end
 
-puts "Goodbye."
-exit
+KilzaApplication.new.run

data/kilza.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Toshiro Sugii"]
   spec.email         = ["rtoshiro@printwtf.com"]
 
-  spec.summary       = %q{Parses JSON objects and generates objects in other languages}
-  spec.description   = %q{Parses JSON objects and generates objects in other languages}
+  spec.summary       = %q{Parses JSON objects and generates objects into other languages}
+  spec.description   = %q{Parses JSON objects and generates objects into other languages}
   spec.homepage      = "https://github.com/Jaspion/Kilza"
   spec.license       = "MIT"
 
@@ -33,5 +33,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "json"
   spec.add_dependency "erubis"
-  spec.add_dependency "highline"
+  spec.add_dependency "tty"
+  spec.add_dependency "pastel"
 end

data/lib/kilza/language/java.rb

@@ -8,6 +8,11 @@ module Kilza
 
       attr_accessor :package
 
+      def initialize(name, package = nil)
+        super(name)
+        @package = package
+      end
+
       def sources
         cur_path = File.expand_path(__FILE__)
         java_path = File.join(File.dirname(cur_path), File.basename(cur_path, '.rb'), "java.erb")

data/lib/kilza/language/java/java.erb

@@ -80,14 +80,14 @@ public class <%= @name %> implements Serializable
     }
 
 <% for @property in @properties %>
-    public void set<%= @property.name.capitalize %>(<%= @property.type %> value) {
+    public void set<%= @property.name.capitalize %>(<%= @property.is_array? ? "ArrayList<" + @property.type + ">" : @property.type %> value) {
         this.<%= @property.name %> = value;
     }
 
     <% if @property.is_boolean? %>
     public <%= @property.type %> is<%= @property.name.capitalize %>() {
     <% else %>
-    public <%= @property.type %> get<%= @property.name.capitalize %>() {
+    public <%= @property.is_array? ? "ArrayList<" + @property.type + ">" : @property.type %> get<%= @property.name.capitalize %>() {
     <% end %>
         return this.<%= @property.name %>;
     }
@@ -98,7 +98,7 @@ public class <%= @name %> implements Serializable
 @hs = []
 for @property in @properties
   @eq.push("((#{@name}) obj).get#{@property.name.capitalize}().equals(#{@property.name})") if (@property.is_key)
-  @hs.push("((#{@property.type})#{@property.name}).hashCode()") if (@property.is_key)
+  @hs.push("(#{@property.name}).hashCode()") if (@property.is_key)
 end
 %>
 <% if @eq.length > 0 %>

data/lib/kilza/property.rb

@@ -20,7 +20,7 @@ module Kilza
     end
 
     def is_object?
-      @type == 'object'
+      @type == 'object' or @type == @name.capitalize
     end
 
     def is_fixnum?

data/lib/kilza/version.rb

@@ -1,3 +1,3 @@
 module Kilza
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kilza
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Toshiro Sugii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: tty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -94,7 +94,21 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Parses JSON objects and generates objects in other languages
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Parses JSON objects and generates objects into other languages
 email:
 - rtoshiro@printwtf.com
 executables:
@@ -148,5 +162,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Parses JSON objects and generates objects in other languages
+summary: Parses JSON objects and generates objects into other languages
 test_files: []