Skip to content

Commit

Permalink
Merge pull request #2 from StackStorm/master
Browse files Browse the repository at this point in the history
Bringing StorminStanley master branch up to date
  • Loading branch information
StorminStanley committed Sep 6, 2014
2 parents 5e05a39 + adafdd9 commit d69b494
Show file tree
Hide file tree
Showing 265 changed files with 2,096 additions and 3,202 deletions.
1 change: 1 addition & 0 deletions .agignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
23 changes: 23 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[MESSAGES CONTROL]
# C0111 Missing docstring
# I0011 Warning locally suppressed using disable-msg
# I0012 Warning locally suppressed using disable-msg
# W0704 Except doesn't do anything Used when an except clause does nothing but "pass" and there is no "else" clause
# W0142 Used * or * magic* Used when a function or method is called using *args or **kwargs to dispatch arguments.
# W0212 Access to a protected member %s of a client class
# W0232 Class has no __init__ method Used when a class has no __init__ method, neither its parent classes.
# W0613 Unused argument %r Used when a function or method argument is not used.
# W0702 No exception's type specified Used when an except clause doesn't specify exceptions type to catch.
# R0201 Method could be a function
# W0614 Unused import XYZ from wildcard import
# R0914 Too many local variables
# R0912 Too many branches
# R0915 Too many statements
# R0913 Too many arguments
# R0904 Too many public methods
disable=C0103,C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201,W0614,R0914,R0912,R0915,R0913,R0904,R0801

[FORMAT]
max-line-length=100
max-module-lines=1000
indent-string=' '
37 changes: 29 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL := /bin/bash
TOX_DIR := .tox
#VIRTUALENV_DIR := $(TOX_DIR)/py27
VIRTUALENV_DIR := virtualenv
VIRTUALENV_DIR ?= virtualenv
WEB_DIR := web
STORMBOT_DIR := stormbot

Expand Down Expand Up @@ -40,14 +40,14 @@ play:


.PHONY: check
check: flake8 checklogs
check: requirements flake8 checklogs

.PHONY: checklogs
checklogs:
@echo
@echo "==================LOG WATCHER===================="
@echo
./log_watcher.py 10
. $(VIRTUALENV_DIR)/bin/activate; ./tools/log_watcher.py 10

.PHONY: docs
docs:
Expand All @@ -56,12 +56,23 @@ docs:
@echo
doxygen $(DOXYGEN_CONFIG)

.PHONY: flake8
flake8: requirements
.PHONY: pylint
pylint: requirements .pylint

.PHONY: .pylint
.pylint:
@echo
@echo "====================flake===================="
@echo "================== pylint ===================="
@echo
. $(VIRTUALENV_DIR)/bin/activate; flake8 --config ./.flake8 $(COMPONENTS)
@for component in $(COMPONENTS); do\
echo "==========================================================="; \
echo "Running pylint on" $$component; \
echo "==========================================================="; \
. $(VIRTUALENV_DIR)/bin/activate; pylint -E --rcfile=./.pylintrc $$component/$$component; \
done

.PHONY: flake8
flake8: requirements .flake8

.PHONY: .flake8
.flake8:
Expand Down Expand Up @@ -179,3 +190,13 @@ rpms:
rm -Rf ~/rpmbuild
$(foreach COM,$(COMPONENTS), pushd $(COM); make rpm; popd;)
pushd st2client && make rpm && popd

.PHONY: debs
debs:
@echo
@echo "====================debs===================="
@echo
rm -Rf ~/debbuild
$(foreach COM,$(COMPONENTS), pushd $(COM); make deb; popd;)
pushd st2client && make deb && popd

11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Stanley
======

Integrate and automate your cloud operations.

### Prerequisites
To setup the development environment with all the prerequisites installed via Vagrant, please refer to the README under https://github.com/StackStorm/devenv.

Expand Down Expand Up @@ -50,3 +52,12 @@ Activate the virtual environment.
* To run a specific test method

nosetests -v {project_name}/tests/{path_to_test_file}/{test_file}.py:{Classname}.{method_name}

## Copyright and license
<br>Copyright 2014 StackStorm, Inc.

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:

[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Loading

0 comments on commit d69b494

Please sign in to comment.