pyonnuka 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24da70001fb7c68f024f9d4a8166887c9a54036
-  data.tar.gz: 54b72a5da89d2a4d040dfe34cd360025185742a6
+  metadata.gz: d219078888200c4468f93f82319fc19939f14775
+  data.tar.gz: 3ae2a5fd922ea2278bcdcb8d0c55be12a06036e1
 SHA512:
-  metadata.gz: 81a294adfd35cb46a37c5cd902a7309016da7b6177124078cc345abe8f51a4f7d3d621a773267dcb0019c85c38e069df8cb864467146b6a37e57a068676f8253
-  data.tar.gz: 5a08b296cc2dbd4b341a73add20f80545cef288e71bd03983e7f7f419cd2e1c378468d4ddd389695ee3b8cc7857ff364370d4f0fa6713b8dcdc72fa158e6280e
+  metadata.gz: c24c472ce8494b5b5029a0a95b9567d8cb068f162565172a21f3756083a5affef0ff441183eaea214f1d02835cf9129dc1f754b693a2b790894f4163b322e652
+  data.tar.gz: 8111c868ab73545f51545acb3896605f454f2098c384703cd74f3783e0803f3e59c6d777c6ff94c00c259200a12538898040906451edc9088287ef94d20c6def

data/bin/pyonnuka

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'pyonnuka'
-require 'pyonnuka/commands/command_task'
+require 'pyonnuka/command'
 
 Pyonnuka::Command.discriminate_command(ARGV)
 

data/lib/pyonnuka.rb

@@ -1,9 +1,8 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'pyonnuka/version'
-require 'pyonnuka/app/app_generator'
-require 'pyonnuka/helpers/commands'
-require 'pyonnuka/app/application'
+require 'pyonnuka/base'
+require 'slim'
 
 module Pyonnuka
   class Application

data/lib/pyonnuka/base.rb

@@ -0,0 +1,83 @@
+module Pyonnuka
+  class Application
+    attr_accessor :env, :request, :response, :params
+
+    def call(env) # :nodoc:
+      @request = Rack::Request.new(env)
+      @response = Rack::Response.new
+      @params = request.params
+      @url = request.fullpath()
+
+      @filename = filename
+      file = ::Slim::Template.new(filename, pretty: true).render()
+
+      [ @response.status.to_i, @response.header, file.split('\n')]
+    end
+
+    def filename
+      # TODO: can add rooting
+      "app/views#{@url}.html.slim"
+    end
+
+    class Server
+      class << self
+        def start(command)
+          production_option = 'all_of_the_world'
+
+          if command[1] == production_option
+            on_server(' -E production -p 8080 -o 0.0.0.0')
+          elsif command[1].nil?
+            on_server
+          else
+            puts "warning: on server with unknown mode #{command[1]}"
+            on_server
+          end
+        end
+
+        def on_server(option=nil)
+          system("rackup #{option}")
+        end
+      end
+    end
+  end
+
+  module Generators
+    require 'fileutils'
+    require 'erb'
+
+    class AppGenerator
+      def initialize app_name
+        @app_name = app_name
+      end
+
+      def start
+        puts "Project #{@app_name} is now creating..."
+        ::FileUtils.mkdir(@app_name)
+
+        %w(gemfile configru app config).each do |file|
+          self.send("create_#{file}")
+        end
+      end
+
+      def create_gemfile
+        ::FileUtils.cp(File.join(File.dirname(__FILE__), './templates/Gemfile'), "#{@app_name}/Gemfile")
+      end
+
+      def create_configru
+        ::FileUtils.cp(File.join(File.dirname(__FILE__), './templates/config.ru'), "#{@app_name}/config.ru")
+      end
+
+      def create_app
+        ::FileUtils.cp_r(File.join(File.dirname(__FILE__), './templates/app/'), "#{@app_name}/app/")
+      end
+
+      def create_config
+        ::FileUtils.mkdir("#{@app_name}/config")
+        erb = ::ERB.new(File.read(File.join(File.dirname(__FILE__), './templates/config/application.rb')))
+        File.open("#{@app_name}/config/application.rb", 'w') do |f|
+          f.write(erb.result(binding))
+        end
+      end
+    end
+  end
+end

data/lib/pyonnuka/command.rb

@@ -0,0 +1,50 @@
+module Pyonnuka
+  class Command
+    class << self
+      def discriminate_command(command)
+        if command[0].nil?
+          out_help
+          return
+        end
+
+        case command[0]
+          when 'new'
+            app_path = command[1]
+            return unless validate_app_path(app_path)
+            generator = Pyonnuka::Generators::AppGenerator.new(app_path)
+            generator.start
+          when 'ikeikegogo'
+            Pyonnuka::Application::Server.start(ARGV)
+          when '-h'
+            out_help
+          when '-v'
+            puts "Pyonnuka #{Pyonnuka::VERSION}"
+        end
+      end
+    end
+
+    private
+
+    class << self
+      def out_help
+        puts <<"EOS"
+Example:
+    pyonnuka new ~/Code/Ruby/taskapp
+
+      This generates a skeletal Pyonnuka installation in ~/Code/Ruby/taskapp.
+      See the README in the newly created application to get going.
+Pyonnuka options:
+    -h  # Show this help message
+    -v  # Show this pyonnuka version
+EOS
+      end
+
+      def validate_app_path(app_path)
+        return true if app_path.present? && ['Pyonnuka', 'pyonnuka'].exclude?(app_path)
+
+        puts app_path.nil? ?  'required application path' : 'Invalid application name pyonnuka. Please choose another name'
+        false
+      end
+    end
+  end
+end

data/lib/pyonnuka/templates/config/application.rb

@@ -9,11 +9,7 @@ require 'active_support/core_ext/array/extract_options'
 module Pyonnuka
   extend ActiveSupport::Autoload
 
-  autoload :WelcomeController
-
   class << self
-    @application = @app_class = nil
-
     def application
       app = <%= @app_name %>::Application.new
     end
@@ -22,12 +18,5 @@ end
 
 module <%= @app_name %>
   class Application < Pyonnuka::Application
-    def call(env)
-      env["PATH_INFO"]
-      [ 200,
-        { 'Content-Type' => 'text/plain' },
-        ["Ruby on Pyonnuka\n\n\n", "Hello, world!!\n", "Path : #{env["PATH_INFO"]}"]
-      ]
-    end
   end
 end

data/lib/pyonnuka/version.rb

@@ -1,3 +1,3 @@
 module Pyonnuka
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pyonnuka
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - masaki_nukaga
@@ -116,15 +116,12 @@ files:
 - bin/pyonnuka
 - bin/setup
 - lib/pyonnuka.rb
-- lib/pyonnuka/app/app_generator.rb
-- lib/pyonnuka/app/application.rb
-- lib/pyonnuka/commands/command_task.rb
-- lib/pyonnuka/helpers/commands.rb
+- lib/pyonnuka/base.rb
+- lib/pyonnuka/command.rb
 - lib/pyonnuka/templates/Gemfile
 - lib/pyonnuka/templates/app/views/welcome/index.html.slim
 - lib/pyonnuka/templates/config.ru
 - lib/pyonnuka/templates/config/application.rb
-- lib/pyonnuka/templates/config/test.rb
 - lib/pyonnuka/version.rb
 - pyonnuka.gemspec
 homepage: https://github.com/pyonnuka/pyonnuka

data/lib/pyonnuka/app/app_generator.rb

@@ -1,44 +0,0 @@
-module Pyonnuka
-  class AppBuilder
-  end
-
-  module Generators
-    require 'fileutils'
-    require 'erb'
-
-    class AppGenerator
-      def initialize app_name
-        @app_name = app_name
-      end
-
-      def start
-        puts "Project #{@app_name} is now creating..."
-        ::FileUtils.mkdir(@app_name)
-
-        %w(gemfile configru app config).each do |file|
-          self.send("create_#{file}")
-        end
-      end
-
-      def create_gemfile
-        ::FileUtils.cp(File.join(File.dirname(__FILE__), '../templates/Gemfile'), "#{@app_name}/Gemfile")
-      end
-
-      def create_configru
-        ::FileUtils.cp(File.join(File.dirname(__FILE__), '../templates/config.ru'), "#{@app_name}/config.ru")
-      end
-
-      def create_app
-        ::FileUtils.cp_r(File.join(File.dirname(__FILE__), '../templates/app/'), "#{@app_name}/app/")
-      end
-
-      def create_config
-        ::FileUtils.mkdir("#{@app_name}/config")
-        erb = ::ERB.new(File.read(File.join(File.dirname(__FILE__), '../templates/config/application.rb')))
-        File.open("#{@app_name}/config/application.rb", 'w') do |f|
-          f.write(erb.result(binding))
-        end
-      end
-    end
-  end
-end

data/lib/pyonnuka/app/application.rb

@@ -1,24 +0,0 @@
-module Pyonnuka
-  class Application
-    class Server
-      class << self
-        def start(command)
-          production_option = 'all_of_the_world'
-
-          if command[1] == production_option
-            on_server(' -E production -p 8080 -o 0.0.0.0')
-          elsif command[1].nil?
-            on_server
-          else
-            puts "warning: on server with unknown mode #{command[1]}"
-            on_server
-          end
-        end
-
-        def on_server(option=nil)
-          system("rackup #{option}")
-        end
-      end
-    end
-  end
-end

data/lib/pyonnuka/commands/command_task.rb

@@ -1,26 +0,0 @@
-module Pyonnuka
-  class Command < Pyonnuka::Helpers::Command
-    class << self
-      def discriminate_command(command)
-        if command[0].nil?
-          out_help
-          return
-        end
-
-        case command[0]
-          when 'new'
-            app_path = command[1]
-            return unless validate_app_path(app_path)
-            generator = Pyonnuka::Generators::AppGenerator.new(app_path)
-            generator.start
-          when 'ikeikegogo'
-            Pyonnuka::Application::Server.start(ARGV)
-          when '-h'
-            out_help
-          when '-v'
-            puts "Pyonnuka #{Pyonnuka::VERSION}"
-        end
-      end
-    end
-  end
-end

data/lib/pyonnuka/helpers/commands.rb

@@ -1,27 +0,0 @@
-module Pyonnuka
-  module Helpers
-    class Command
-      class << self
-        def out_help
-          puts <<"EOS"
-Example:
-    pyonnuka new ~/Code/Ruby/taskapp
-
-      This generates a skeletal Pyonnuka installation in ~/Code/Ruby/taskapp.
-      See the README in the newly created application to get going.
-Pyonnuka options:
-    -h  # Show this help message
-    -v  # Show this pyonnuka version
-EOS
-        end
-
-        def validate_app_path(app_path)
-          return true if app_path.present? && ['Pyonnuka', 'pyonnuka'].exclude?(app_path)
-
-          puts app_path.nil? ?  'required application path' : 'Invalid application name pyonnuka. Please choose another name'
-          false
-        end
-      end
-    end
-  end
-end

data/lib/pyonnuka/templates/config/test.rb

@@ -1,4 +0,0 @@
-require 'erb'
-
-file = ERB.new(File.read('./application.rb')).result(binding)
-puts file