Merge branch 'release/v0.6.0' into develop

2014-06-21 01:40:54 +02:00 · 2014-06-21 01:40:54 +02:00 · cc51b5f094
commit cc51b5f094
parent b1b2ee3501 3fe217d411
5 changed files with 64 additions and 49 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -1,4 +1,8 @@
 ### v0.6.0
+- Feature: Added a Graphical User interface
+- Feature: Automatic config file createion from config samples
+- FIX: The default name of the output files will now consist of the compound name and the file format when using the CLI
+- FIX: A lot of bugfixes of the PubChem plugin, as is wasn't working as it should
 - FIX: Using absolute path for configuration files
 - DEV: General Code cleanup in documentation

--- a/SIGNED.md
+++ b/SIGNED.md
@ -3,19 +3,19 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)

-iQIcBAABAgAGBQJTn3GgAAoJEJrQ9RIUCT6/CI4P/RSAQrd6JugGZoQu/gNdW6eB
-MYCybqYGZiieVhUaGOnFNVlp68YpXH+sP/Uc6hXEX30UQEsDmhMeT5NA7ZMS+zJ9
-MNHGQdJq22lGb3+VoVBV4RTMdkQXOXvx6p5biskjIEtM3tfTxP529GvAX2TFUNnt
-gGWk28EDr30M95XwDxwWo+57Xv8VtSb3VSvXEbrdwGYf8EoQo9oPtzYQ0YcdupcC
-ET8bukYVcwpAjoTnPlEy89TiHHohwmimr2ASXeQ64Ks5wfjzcF7NENCAmaAfR+KI
-VLLuGqdWMBx1ewVuAXTCZ0Mga/kBoRUaO0PC13UmL8LhhZY9Z3cwD4UnPU35/RQi
-IbLfQcZHf/gEvyMeiTYCsyWpm+/xxn1+EfHol4/Q9VSXzZgRBX05Ik6tqeCvjdgG
-4PyHBaJTTm/HfMNdg3mr1mbyjTv5UxglEyPv+Y4NdfoVfepkXsXbzvNSyVffZ3Bw
-UaFp7KzIC4Jugdpv63FleiAdDY0+iZ5shH86wD1+HJ0/a87kn5Ao1yESby7J7U+f
-poZQYeMFeuC0T5hY/3iYoyvZ68oH918ESESiucSulp5BvfwuqGL2+xo5uJIwGYXE
-3IDQC7xbA14JHX86IVJlSHAD33iWyiC+5yjw4/bRRVl37KPsLdHiXH3YIRnF5I2I
-ZbM/uDYyJdZbBe4UoCoF
-=AMhi
+iQIcBAABAgAGBQJTpMZAAAoJEJrQ9RIUCT6/Hf8P/AyX9ZD5zj6rBi2CwDOTs5aa
+flVqw9syvdqTzVfXQaR4UrCSOuyuOeAkiqub0BMjxyCurqAwN/SCPf3uOJ/tGXmt
+ZPtYVHjevJ4mbojLhZiJ2av8LC9VOh3Zl+reR3L2cLuBD4rVSrfUMJtczbbtNlk+
+mczRcTpzNvHQW6mKqyUoKn8xqNnLC7C+p5ybNZ5EADUfoKIF1xyTN6je6fpYZ1U
+IHxiUzeOvfX9ohmbfnfkpkuSll1nUJWsTgUPKhthJuxEhwCQ1xMdWhxfcyZJaMT2
+Pxgo8C8S6lzAk4PxBRBoePjgWAeaFmbr317WXHvw6SSHPIdzToKZgDiDC5LWvKxb
+RRdLZ6w7tg0/FSUexekrUafGT8Je0oIoLUQlNaEQzrPNhDpma1uHFfZg0vb2m4Hq
+WHLLKTCr6FMczhP1TmuIEtdjKtymT+rO+Ls4ciw+654R7MtBYcmTr+RqmAd+GadJ
+vJNmGDod2oPwCydEps8bYAbksqRhMmk3xwco/g6dWYh5/+1GzCr80J7fYpqtoPFH
+V5qKyDQovF5jPlb/buq4mH8XYVT1z4Sx8azKVctMLig57zRnvN0WyskpT09oY7dK
+TPvIqwTixekndYLcM3QacVq/NhVOOQPFvD0PwU18eKs4EfD2L7iWd2XjV9Az++aD
+jUY6EwEuOzDCexWP4eM8
+=h6TK
 -----END PGP SIGNATURE-----

 ```
@ -27,38 +27,45 @@ ZbM/uDYyJdZbBe4UoCoF
 #### Expect

 ```
-size  exec  file                      contents                                                        
-            ./                                                                                        
-375           .gitignore              d2e475a6a4fa51422cac0a07495914e776858fb9ab9c8937a4d491a3e042d6b1
-464           .travis.yml             3063ba078607b8d16bd6467afc15fbbaa4b26c1e30be5ce7cef453cfccbaa95c
-428           Changelog.md            c7791d1914ddca9ff1549d90468a79787a7feafe94cecd756e3d7cbd4bcbc7df
-              FourmiCrawler/                                                                          
-0               __init__.py           e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-304             items.py              b00d49a3d53fa13306c7f8b023adb93ab88423c4fce46600689814f6b02bb806
-2178            pipelines.py          f9b7b84938060751e15e45de5133dffe50c798bff2a20019206fe7c9d677ad49
-914             settings.py           0be2eaf8e83e85ed27754c896421180fc80cb5ce44449aa9f1048e465d1a96f2
-                sources/                                                                              
-9991              ChemSpider.py       847013e34c5c3683ec66a337837287512b4bab9fbea2ece12e4130ab0dbf264d
-9898              NIST.py             97abc84fce85c47b789822715a1945ab84cc052a32340c861141c1af66bab644
-4754              PubChem.py          58ed4c92519e385f2768cf8034b006b18f8a21632cb1c5a0849b1a329a8c6ffb
-6907              WikipediaParser.py  5d6de911c773129a34b76c40a9b547aafc67644a15f39cd0be6afc7a16fb0f97
-0                 __init__.py         e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-1262              source.py           16c4cdfca849b7dc2bc89d7a6f7ad021f4aa1d04234394312f1d0edf0fd9c5a4
-3026            spider.py             1ffba2512988b7a6b535a4a31a4ef688ece4f8c595c3d50355c34ef46b23e44a
-1081          LICENSE                 36951e5f1910bad3e008ab7228f35ad8933192e52d3c3ae6a5e875765e27192c
-3965          README.md               d21236d6a175be28ef8e2fee8a256e95b6a513163e3f1071c26c62e9093db7f3
-3676  x       fourmi.py               2ff89f97fd2a49d08417d9ab6cf08e88944d0c45f54ec84550b530be48676c23
-261           scrapy.cfg              624c068fd06303daa65b8e0d0d3ef88ac1f123be2694ef5b4f3f9a9dcd983f85
-              tests/                                                                                  
-1               __init__.py           01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-2837            test_configurator.py  4a0eb6e7121eb09a63ab5cb797570d1a42080c5346c3b8b365da56eefa599e80
-1892            test_pipeline.py      387a336b0f36722a20e712aa033e5771c44f9e92561dd73acffd53d622c52031
-1260            test_sourceloader.py  b108b4b80adcdb7401273a9823b1f1a19eb5178776186eb5a9976aed8b1ee869
-2113            test_spider.py        300f280377b522737be0d8e4a80031ab118a4011bdbb92131e9c400fcdab6299
-              utils/                                                                                  
-0               __init__.py           e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-3552            configurator.py       e2b7e0ee6c1fef4373785dfe5df8ec6950f31ce6a5d9632b69a66ea3d1eaf921
-2537            sourceloader.py       f5a5ac2a6aba0658dbe11361f465caabcf3c06c5c8dc9a631874211cc19d2d37
+size   exec  file                      contents                                                        
+             ./                                                                                        
+412            .gitignore              25059da2ee328837ece01b979cd5c1083ed1679372f06c14c1c58035d8120614
+548            .travis.yml             7f11bc58a8e94276ef949afeb107f9f1e184c0dbb84f821705ea2245902ed546
+846            Changelog.md            345f9aea4812b37b1b2714703ea0d5edd27414c0f839ec3e322450ad5ec5c6ed
+               FourmiCrawler/                                                                          
+0                __init__.py           e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+304              items.py              b00d49a3d53fa13306c7f8b023adb93ab88423c4fce46600689814f6b02bb806
+2178             pipelines.py          f9b7b84938060751e15e45de5133dffe50c798bff2a20019206fe7c9d677ad49
+677              settings.py           f1e7d21b899ffc2523516c0ebe67d967dc62495b90c2fe34651042a3049fcd94
+                 sources/                                                                              
+12103              ChemSpider.py       f647d70acf9b3f1ee7bde75586aa45156331f977ca7fe836ceac4477a2c0d4ce
+12400              NIST.py             cdb4c423355ac8fb1097197a9f8df44f667925a785c6bae7c583820da08908ee
+6121               PubChem.py          8f8ad40459090b818a384a202e739fe4696a04154df2b8419aee896b0fa02481
+6930               WikipediaParser.py  ae9f57bbf2aad9c371abcd143fd2dda5995a196cb700734a5035dd94b1988870
+0                  __init__.py         e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+1281               source.py           7927fda259ff2c8096fa526db1f08586de6e04473a491e19a07b092fdeed81fc
+3111             spider.py             ec7c946907fea10c17ee6dd88a506f3e3bf2cd748e3eb09200487fcec2ae7ba3
+               GUI/                                                                                    
+11               __init__.py           40567015c415e853210425c1b4f3834dbc2a3165e3713e04dd3424b79bc90aa3
+940              configImporter.py     5d731d63a3117b25b7e556a746a1dd5b16e8cbb60e57be46de333c31c8c00271
+8776             gui.py                20b2220bc3ca55ebfd6d04e8c0bebbf1ae316c85a54db60b8fc02d22642f19d5
+299            GUI.cfg.sample          4ee27f7099d588c21358cd645a21621e631d80712f1b514dad898faa5fee2483
+1081           LICENSE                 36951e5f1910bad3e008ab7228f35ad8933192e52d3c3ae6a5e875765e27192c
+3900           README.md               f4a1e3ea1700d2b415acfad661cb45f960fe8e8ffbe98dbecb6c7ed071a101ac
+3846   x       fourmi.py               f0b11f5f153f96f6af2e504cdf369e43c04316752de131a659eb6246fd80212a
+261            scrapy.cfg              624c068fd06303daa65b8e0d0d3ef88ac1f123be2694ef5b4f3f9a9dcd983f85
+416            sources.cfg.sample      11cd0fc18693da17883c98d25a384ae1b6158adfef13778b6dd02b878f6b8a70
+               tests/                                                                                  
+107              __init__.py           ce90e54e58a0912cadbe3adcf5166dc72477bf9ce289bf427f8e2f5b25406670
+2870             test_configurator.py  318d542b1cda5075a2a9a6be97e9e7a79372ee58e1ab3014c161534094f7364d
+1315             test_gui.py           0fb95d0b542765bf52bcebb037bf2ed1299209beab23448af741a93c9fbb1ca8
+1892             test_pipeline.py      387a336b0f36722a20e712aa033e5771c44f9e92561dd73acffd53d622c52031
+1260             test_sourceloader.py  b108b4b80adcdb7401273a9823b1f1a19eb5178776186eb5a9976aed8b1ee869
+2113             test_spider.py        300f280377b522737be0d8e4a80031ab118a4011bdbb92131e9c400fcdab6299
+               utils/                                                                                  
+40               __init__.py           f1237ae74693e2ec1b3154e57aec27438a80a735e5ccf2411aecd194ef443b6a
+4047             configurator.py       8b566a0435a9f105a8ec616b16c3e21edb9b82f8debe1ef9f1df6bbbf20949d5
+2537             sourceloader.py       f5a5ac2a6aba0658dbe11361f465caabcf3c06c5c8dc9a631874211cc19d2d37
 ```

 #### Ignore
--- a/fourmi.py
+++ b/fourmi.py
@ -25,7 +25,6 @@ Options:
 """

 from twisted.internet import reactor
-
 from scrapy.crawler import Crawler
 from scrapy import signals, log
 import docopt
@ -72,7 +71,7 @@ def search(docopt_arguments, source_loader):

 # The start for the Fourmi Command Line interface.
 if __name__ == '__main__':
-    arguments = docopt.docopt(__doc__, version='Fourmi - V0.5.3')
+    arguments = docopt.docopt(__doc__, version='Fourmi - V0.6.0')
    loader = SourceLoader()

    if arguments["--include"]:
--- a/tests/init.py
+++ b/tests/init.py
@ -1,2 +1,6 @@
-import test_configurator, test_gui, test_pipeline, test_sourceloader, test_spider
+import test_configurator
+import test_gui
+import test_pipeline
+import test_sourceloader
+import test_spider

--- a/utils/init.py
+++ b/utils/init.py
@ -1 +1,2 @@
-import configurator, sourceloader
+import configurator
+import sourceloader