Merge pull request #44 from Moduland/main_script

Main script

Author: sepandhaghighi

.github/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at info@moduland.ir. All
+reported by contacting the project team at info@orangetool.ir. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

.github/FUNDING.yml

@@ -0,0 +1,100 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen

.gitignore

@@ -30,6 +30,7 @@ matrix:
 install:
   - pip install -r requirements.txt
   - python setup.py install
+  - python -m orangetool
 before_script:
   - pip install --upgrade --upgrade-strategy=only-if-needed -r dev-requirements.txt
   - chmod +x test.sh

.travis.yml

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 ### Added
-- `FUNDING.yml`
+- `__main__.py`
 - `__version__` variable
 - `hibernate` function
 - `usb_control`, `usb_on` and `usb_off` functions
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `Zone` parameter renamed to `zone`
 - `uptime` and `idletime` functions updated
 - Docstrings updated
+- `README.md` modified
 ## [0.35] - 2019-06-01
 ### Added
 - `version_check.py`

CHANGELOG.md

@@ -71,7 +71,8 @@ Tested on [Lubuntu](http://lubuntu.me/)
 <table>
 	<tr> 
 		<td align="center">Code Quality</td>
-		<td align="center"><a href="https://www.codacy.com/app/sepand-haghighi/Orangetool?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Moduland/Orangetool&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/ad9374e6e7b24a63b34d6a4f419497ac"/></a></td>	
+		<td align="center"><a href="https://www.codacy.com/app/sepand-haghighi/Orangetool?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Moduland/Orangetool&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/ad9374e6e7b24a63b34d6a4f419497ac"/></a></td>
+		<td align="center"><a href="https://codebeat.co/projects/github-com-moduland-orangetool-dev"><img alt="codebeat badge" src="https://codebeat.co/badges/78f987a9-d504-4d29-b98d-21dd1f2d319e" /></a></td>
 		<td align="center"><a href="https://www.codefactor.io/repository/github/moduland/orangetool"><img src="https://www.codefactor.io/repository/github/moduland/orangetool/badge" alt="CodeFactor" /></a></td>		
 	</tr>
 </table>
@@ -128,7 +129,7 @@ ip_status=orangetool.ping(ip_address) #this function check ip and return True if
 
 #5- set_ip
 
-set_ip("192.168.1.46","eth0")  #this function set static ip for system
+orangetool.set_ip("192.168.1.46","eth0")  #this function set static ip for system
 
 #6- mac
 
@@ -275,7 +276,7 @@ orangetool.check_update() # Return True if new version is available
 ## Issues & Bug Reports			
 
 Just fill an issue and describe it. We'll check it ASAP!							
-or send an email to [info@moduland.ir](mailto:info@moduland.ir "info@moduland.ir"). 
+or send an email to [info@orangetool.ir](mailto:info@orangetool.ir "info@orangetool.ir"). 
 
 ## Dependencies
 

README.md

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+"""Orangetool main."""
+
+from .orangetool_system import version
+
+if __name__ == "__main__":
+    version()

orangetool/__main__.py

@@ -47,7 +47,7 @@ def local_ip(debug=False):
         ip = socket.gethostbyname(socket.gethostname())
         if ip != "127.0.0.1":
             return ip
-        elif platform.system() != "Windows":
+        if platform.system() != "Windows":
             command = sub.Popen(["hostname",
                                  "-I"],
                                 stdout=sub.PIPE,
@@ -110,7 +110,7 @@ def set_ip(ip, restart=False, device="eth0", debug=False):
         dns-nameservers 8.8.8.8 8.8.4.4
     '''
     try:
-        if bool(re.match(IP_PATTERN, ip)) == False or ip.find(
+        if not bool(re.match(IP_PATTERN, ip)) or ip.find(
                 "192.168.") == -1 or device not in mac().keys():
             raise Exception("IP Formation Error")
         static_string = static_string.replace("ip", ip)
@@ -142,7 +142,7 @@ def ping(ip, packet_number=3, debug=False):
     :return: a boolean value (True if ip is available and False otherwise)
     """
     try:
-        if re.match(IP_PATTERN, ip) == False:
+        if not re.match(IP_PATTERN, ip):
             raise Exception("IP Formation Error")
         output = str(list(sub.Popen(["ping",
                                      ip,

orangetool/orangetool_ip.py

@@ -27,8 +27,7 @@ def mount_status(device_name, debug=False):
                 memory_list.append(temp[1])
         if len(memory_list) == 0:
             return "u"
-        else:
-            return memory_list
+        return memory_list
     except Exception as e:
         if debug:
             print(str(e))

orangetool/orangetool_storage.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """Orangetool test."""
-from orangetool import *
+from orangetool import version, check_update
 
 if __name__ == "__main__":
-    version()
+    version()
+    check_update()