Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added birth to cli. Updated readme. Separated license.

  • Loading branch information...
commit 3604d939f1440e7496ee56284c19e09bb117dc91 1 parent 41b249e
@balupton balupton authored
Showing with 48 additions and 40 deletions.
  1. +25 −0 LICENSE
  2. +7 −23 README.md
  3. +16 −17 cli
View
25 LICENSE
@@ -0,0 +1,25 @@
+Aloha Editor
+============
+
+Aloha Editor is meant to be an free and open source for all now and in future.
+
+We encourage continuous, selfsustainable development supported by both the open source
+community and commercial stakeholders. This way both parties (community and commercial users)
+profit from each other by code and financial ressources for core developement.
+Therefore we adopted a dual licensing approach for Aloha Editor.
+
+Opensource Software License
+===========================
+The Open Source version of Aloha Editor is released under the terms of AGPLv3 License.
+http://www.gnu.org/licenses/agpl.html
+
+Commercial Software License
+============================
+The commercial version of Aloha Editor allows to use, modify, copy and distrubute without
+any restrictions as stated in the commerical license agreement.
+
+Translation License
+===================
+All contributions to translations of dictionary entries apply to the Creative Commons
+Attribution License V3.0 BY. By contributing transaltions you agree to the license terms.
+http://creativecommons.org/licenses/by/3.0/
View
30 README.md
@@ -1,26 +1,10 @@
-Aloha Editor
-============
+# Welcome to Aloha Editor
-Aloha Editor is meant to be an free and open source for all now and in future.
+For developers refer to the development guide here:
+http://aloha-editor.org/wiki/Development_guide
-We encourage continuous, selfsustainable development supported by both the open source
-community and commercial stakeholders. This way both parties (community and commercial users)
-profit from each other by code and financial ressources for core developement.
-Therefore we adopted a dual licensing approach for Aloha Editor.
+For end users and implementors refer to the wiki here:
+http://aloha-editor.org/wiki/Main_Page
-Opensource Software License
-===========================
-The Open Source version of Aloha Editor is released under the terms of AGPLv3 License.
-http://www.gnu.org/licenses/agpl.html
-
-Commercial Software License
-============================
-The commercial version of Aloha Editor allows to use, modify, copy and distrubute without
-any restrictions as stated in the commerical license agreement.
-
-
-Translation License
-===================
-All contributions to translations of dictionary entries apply to the Creative Commons
-Attribution License V3.0 BY. By contributing transaltions you agree to the license terms.
-http://creativecommons.org/licenses/by/3.0/
+Visit our website here:
+http://aloha-editor.org/
View
33 cli
@@ -1,27 +1,17 @@
#!/usr/bin/env ruby
# == Name
-# cli - Aloha Editor's Command Line Interface
+# cli - Aloha Editor's Command Line Interface
#
# == Synopsis
-# TODO: finish this section
-#
-# == Examples
-# TODO: finish this section
+# Refer to the README file for usage
#
# == Options
-# -h, --help Displays help message
-# -v, --version Display the version, then exit
-# -q, --quiet Output as little as possible, overrides verbose
-# -V, --verbose Verbose output
-#
-# == Author
-# Benjamin Arthur Lupton
+# -h, --help Displays help message
+# -v, --version Display the version, then exit
+# -q, --quiet Output as little as possible, overrides verbose
+# -V, --verbose Verbose output
#
-# == Copyright
-# Copyright (c) 2008-2011 Benjamin Arthur Lupton
-# Licensed under the New BSD License
-# http://creativecommons.org/licenses/BSD/
require 'optparse'
require 'rdoc/usage'
@@ -92,7 +82,7 @@ class App
# Initialise our Environment
def init_env
# Check for Requirements
- reqs = ['mkdir','curl','tar','git']
+ reqs = ['mkdir','curl','tar','git','ant']
reqs.each do |req|
has_req = `which #{req}`.strip
if has_req.empty?
@@ -354,6 +344,15 @@ class App
# ---------------------------------------------------------------------------
# Utility
+ # Give Birth to a New Aloha Editor
+ def birth
+ puts "Welcome to the Aloha Editor CLI.\nWhat is your repository URL? E.g. git@github.com:balupton/Aloha-Editor.git"
+ url = gets.chomp.strip
+ run("git init");
+ remote_add(url,"origin")
+ install
+ end
+
# Install Aloha Editor
def install
init_branches
Please sign in to comment.
Something went wrong with that request. Please try again.