rbender 0.3.0 → 0.4.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b890be6a91b37ef81fbf86ff6dd52a3ba3d1edbb
-  data.tar.gz: cdf21a6de8c3cf294d185b8a5afeb7136354d530
+  metadata.gz: 08ad5e18cf3f89a0c2e77f4bb029986396cda53c
+  data.tar.gz: 02c2241374a6e8c45a4df2f78c288814bfaee467
 SHA512:
-  metadata.gz: 8f4323aac3697a92d4946b40cabdbe34a307c8cf5701c0bffa98da76b771a1c974dc35548a9a4ba4a1b6de31c06e58840a8e01463f1805f7ac9c85a588c92387
-  data.tar.gz: 33391ad4a580ff4b19a8d0b744f7084c60b6a7a56ba30b834814d299fc50f40f89ac2bed5fdbe55d2bfd97e3c619ccc0a5be0de8534eb123daef23adc091a5c8
+  metadata.gz: d310e3e1f769f80c6b6ccea0d4c3a20341e18580938296c10acad617d3a5c3f0eb784f19adddff5520543177f736299d8eb49a3f4bd71db1f70f3b546aa67821
+  data.tar.gz: d1d18a8e0981e7bca3a47ba227c83db61ed52a148a9d4b5f7b73b0868883ca8ea70eb7d2b2b6957da2593251cb80072a663b38fce9eb62862ccb2c44f3b2df45

data/bin/rbender

@@ -1,15 +1,124 @@
 #!/usr/bin/env ruby
-# require 'rbender'
+require 'rbender'
+require 'ostruct'
+require 'optparse'
+require 'fileutils'
 
+class OptParser
 
-if ARGV.any?
+	MODE_DEV  = "dev"
+	MODE_PROD = "prod"
 
-	require 'optparse'
-	OptionParser.new do |op|
-		op.on("new NAME", 'creates new bot\'s environment') do |name|
-			puts name.to_s
-			puts 'here'
+	def self.parse(args)
+		options       = OpenStruct.new
+		options.mode  = "dev"
+		options.name  = "prod"
+		options.start = false
+
+		global = OptionParser.new do |opts|
+			opts.banner = "Usage: rbender [options]"
+
+			opts.separator ""
+			opts.separator "Common options:"
+			opts.on_tail("-v", "--version", "Prints current RBender version") do
+				puts "RBender version: #{RBender::VERSION}"
+				puts "by art2rik (https://github.com/art2rik)"
+			end
+
+			opts.on("-m", "--mode [MODE]", [MODE_DEV, MODE_PROD],
+							"Sets running mode (default 'dev')") do |mode|
+				options.mode = mode
+				unless mode != MODE_DEV or mode != MODE_PROD
+					raise ArgumentError, "Available modes are dev/prod"
+				end
+			end
+
+			opts.on_tail("-h", "--help", "Shows help message") do
+				puts opts
+				exit
+			end
+
+		end
+
+		global.order!
+		# subcommands[args.shift].order!
+
+		global.parse! args
+
+		options
+	end
+
+end
+
+def create_project(options, args)
+	unless args[0] =~ /\w{3,16}/ and args[1] == nil
+		raise ArgumentError, "Name must be from 3 to 16 english letters without spaces"
+	end
+	name = args[0]
+	name_undrscr = RBender::ConfigHandler.underscore(name)
+	begin
+	FileUtils.mkdir name
+	rescue
+		puts "Folder #{name} already exists"
+		exit
+	end
+
+	project_dir = "#{Dir.getwd}/#{name}"
+	FileUtils.chdir name
+	FileUtils.mkdir "locales"
+	FileUtils.mkdir "lib"
+
+	FileUtils.chdir __dir__
+	FileUtils.chdir "../templates"
+	FileUtils.cp_r "locales", project_dir
+	FileUtils.cp_r "config.yaml", project_dir
+	FileUtils.cp_r "Gemfile", project_dir
+	FileUtils.cp_r "sample.rb", "#{project_dir}/#{name_undrscr}.rb"
+
+	#TODO: change name in config
+
+	RBender::ConfigHandler.config_path = project_dir
+	config = RBender::ConfigHandler.settings
+	config['title'] = name
+	config.save
+
+	puts "Project #{name} successfully created"
+
+end
+
+def run(options, args)
+		begin
+		settings = RBender::ConfigHandler.settings
+		rescue
+			puts 'Main file or config are missing!'
 		end
-	end.parse!(ARGV.dup)
+		title = RBender::ConfigHandler.underscore(settings['title'])
+		load "#{Dir.pwd}/#{title}.rb"
+		bot_frame = RBender.instance
+		#TODO: add mode setting
+		RBender::ConfigHandler.config_path = __dir__
+		bot_frame.set_params(settings)
+		bot_frame.run!
+end
+
+# --- EXECUTE CODE ______
+begin
+	options = OptParser.parse(ARGV.dup)
+	command = ARGV.shift
+
+	case command
+		when 'new'
+			create_project(options, ARGV.dup)
+		when "start"
+			run(options, ARGV.dup)
+	end
+rescue ArgumentError => e
+	puts "Wrong argument: #{e}"
+	puts "Try 'help' command"
 end
 
+
+
+
+
+

data/lib/rbender.rb

@@ -2,7 +2,7 @@ require 'rbender/base'
 require 'colorize'
 
 module RBender
-  VERSION = '0.2.30'
+  VERSION = '0.4.82'
   @@bot = RBender::Base.new
 
   def self.instance
@@ -33,7 +33,7 @@ def method_missing(m, *args, &block)
       end
     end
   else
-    raise NoMethodError, 'Method is missing'
+      raise NoMethodError, "Method #{m} is missing!"
   end
 end
 

data/lib/rbender/base.rb

@@ -5,165 +5,189 @@ require 'rbender/sessionmanager'
 require 'rbender/keyboard_inline'
 require 'rbender/mongo_client'
 require 'rbender/state'
+require 'rbender/config_handler'
+require 'rbender/methods'
+require 'rbender/keyboard'
+
 
 require 'telegram/bot'
 
 
 class RBender::Base
-  attr_accessor :api
-  include RBender::SessionManager
-
-  def initialize
-    @states = {}
-    @global_state = nil
-    @modules_block
-  end
-
-  def modules(&modules_block)
-    @modules_block = modules_block
-  end
-
-  # Runs the bot with server
-  public
-  def run!
-    puts "Bot is loading...".green
-    puts "Bot is running...".green
-    Telegram::Bot::Client.run(@token) do |bot|
-      @api = bot.api
-
-      unless @modules_block.nil?
-        instance_exec(@api, @mongo_client, &@modules_block)
-      end
-      bot.listen do |message| # When message has gotten
-        # begin
-          _process_message(message)
-        # rescue => ex
-        #   puts ex.message
-        # end
-      end
-    end
-  end
-
-  public
-  def _process_message(message)
-    chat_id = message.from.id # Unique chat ID
-
-    if has_session?(chat_id)
-      session = load_session(chat_id)
-
-    else # If user is new
-      session = {_state: :start,
-                 _state_stack: [],
-                 _keyboard_switchers: {},
-                 _keyboard_switch_groups: {},
-                 _lang: :default
-      }
-
-    end
-    session[:user] = {chat_id: chat_id,
-                      first_name: message.from.first_name,
-                      last_name: message.from.last_name,
-                      username: message.from.username
-    }
-
-    session[:user].freeze # User's data must be immutable!
-
-    if is_start_message? message
-      session[:_state] = :start
-      session[:_state_stack] = []
-    end
-
-    state = session[:_state] # User's state
-    state_block = @states[state] # Block of the state
-    state_object = RBender::State.new message, # Object to invoke
-                                      @api,
-                                      session,
-                                      &state_block
-    state_object.instance_eval(&@global_state) unless @global_state.nil?
-    state_object._build
-    state_object._invoke
-    save_session session
-
-    state_new = session[:_state] # New user's state
-
-    unless state_new == state # If state has changed
-      state_object._invoke_after if state_object.has_after? #invoke after hook for an old state
-
-      state_new_block = @states[state_new]
-      state_object = RBender::State.new message,
-                                        @api,
-                                        session,
-                                        &state_new_block
-
-      state_object.instance_eval(&@global_state) unless @global_state.nil?
-      state_object._build
-
-      if state_object.has_keyboard? # Invoke a keyboard if it's exists
-        state_object._build_keyboard
-        state_object._invoke_keyboard
-      end
-
-      state_object._invoke_before if state_object.has_before? #invoke before hook for a new state
-    else
-      if state_object.has_keyboard? # Invoke a keyboard if it's exists
-        unless state_object._keyboard.one_time? or not state_object._keyboard.force_invoked?
-          state_object._build_keyboard
-          state_object._invoke_keyboard
-        end
-      end
-    end
-  end
-
-  def is_start_message?(message)
-    if message.instance_of? Telegram::Bot::Types::Message
-      if message.text == '/start'
-        true
-      else
-        false
-      end
-    end
-  end
-
-  # @param [Hash] params - hash with params
-  #
-  # Available parameters:
-  # * mongo_server_ip (required)
-  # * mongo server_port  (required)
-  # * bot_name (required)
-  # * token (required)
-  # * localizations(optional) default = :default
-  def set_params(params)
-    RBender::MongoClient.setup(params[:bot_name],
-                               params[:mongo_server_ip],
-                               params[:mongo_server_port])
-
-    session_setup(RBender::MongoClient.client)
-
-    @token = params[:token]
-    # if params.has_key? localizations
-    #
-    # end
-  end
-
-
-  # Adds new state to the bot.
-  # @param [String] state_name - name of the state
-  # @param [Block] block - actions while state has invoked
-  #
-  public
-  def state(state_name, &block)
-    unless @states.has_key? state_name
-      @states[state_name] = block
-    else
-      raise "State name is duplicated!"
-    end
-  end
-
-
-  def global(&block)
-    @global_state = block
-  end
-
+	attr_accessor :api
+	include RBender::SessionManager
+
+	public
+
+	def initialize
+		@states       = {}
+		@global_state = nil
+		@modules_block
+	end
+
+	def modules(&modules_block)
+		@modules_block = modules_block
+	end
+
+	# Runs the bot with server
+	def run!
+		puts "Bot is loading...".green
+		puts "Bot is running...".green
+		Telegram::Bot::Client.run(@token) do |bot|
+			@api = bot.api
+
+			unless @modules_block.nil?
+				instance_exec(@api, @mongo_client, &@modules_block)
+			end
+			bot.listen do |message| # When message has gotten
+				begin
+					process_message(message)
+				rescue => ex
+					puts ex.message.red
+					puts ex.backtrace
+				end
+			end
+		end
+	end
+
+
+	# @param [Hash] params - hash with params
+	#
+	# Available parameters:
+	# * mongo (required) connection string
+	# * bot_name (required) name of bot
+	# * token (required) token
+	def set_params(params)
+		RBender::MongoClient.setup(params['title'], params['mongo'])
+
+		session_setup(RBender::MongoClient.client)
+
+		@token = params['development']['token']
+		# if params.has_key? localizations
+		#
+		# end
+	end
+
+	# Adds new state to the bot.
+	# @param [String] state_name - name of the state
+	# @param [Block] block - actions while state has invoked
+	#
+	def state(state_name, &block)
+		unless @states.has_key? state_name
+			@states[state_name] = block
+		else
+			raise "State name is duplicated!"
+		end
+	end
+
+
+	def global(&block)
+		@global_state = block
+	end
+
+
+	private
+
+	def process_message(message)
+		chat_id = message.from.id # Unique chat ID
+
+		session = get_session(chat_id, message)
+
+
+		state        = session[:state] # User's state
+		state_block  = @states[state] # Block of the state
+		state_object = RBender::State.new message, # Object to invoke
+																			 @api,
+																			 session,
+																			 &state_block
+		state_object.instance_eval(&@global_state) unless @global_state.nil?
+		state_object.build
+		state_object.invoke
+
+		if is_start_message? message
+			state_object.invoke_before if state_object.has_before?
+		end
+
+		save_session session
+
+		state_new = session[:state] # New user's state
+
+
+		on_state_changed(state_object,
+										 state,
+										 state_new,
+										 message,
+										 session)
+	end
+
+	def on_state_changed(state_object, state_old, state_new, message, session)
+		if state_new != state_old  # If state has changed
+			state_object.invoke_after if state_object.has_after? #invoke after hook for an old state
+
+			state_new_block = @states[state_new]
+			state_object    = RBender::State.new message,
+																						@api,
+																						session,
+																						&state_new_block
+
+			state_object.instance_eval(&@global_state) unless @global_state.nil?
+			state_object.build
+
+			if state_object.has_keyboard? # Invoke a keyboard if it's exists
+				state_object.build_keyboard
+				state_object.invoke_keyboard
+			end
+
+			state_object.invoke_before if state_object.has_before? #invoke before hook for a new state
+		else
+			if state_object.has_keyboard? # Invoke a keyboard if it's exists
+				unless state_object.get_keyboard.one_time? or not state_object.get_keyboard.force_invoked?
+					state_object.build_keyboard
+					state_object.invoke_keyboard
+				end
+			end
+		end
+	end
+
+	def get_session(chat_id, message)
+		if has_session?(chat_id)
+			session = load_session(chat_id)
+
+		else # If user is new
+			session = {state:                  :start,
+								 state_stack:            [],
+								 keyboard_switchers:     {},
+								 keyboard_switch_groups: {},
+								 lang:                   :default
+			}
+
+		end
+
+		session[:user] = {chat_id:    chat_id,
+											first_name: message.from.first_name,
+											last_name:  message.from.last_name,
+											user_name:  message.from.username
+		}
+
+		session[:user].freeze # User's data must be immutable!
+
+		if is_start_message? message
+			session[:state]       = :start
+			session[:state_stack] = []
+		end
+
+		session
+	end
+
+	def is_start_message?(message)
+		if message.instance_of? Telegram::Bot::Types::Message
+			if message.text == '/start'
+				true
+			else
+				false
+			end
+		end
+	end
 end